Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / fs / ceph / super.c

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index e350cc1611e4d0ac842d99d76ba324b98659ef44..a63997b8bcff8ac6d5967361700d79f1b6e35c3f 100644 (file)
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -414,6 +414,10 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root)
                seq_puts(m, ",noshare");
        if (opt->flags & CEPH_OPT_NOCRC)
                seq_puts(m, ",nocrc");
+       if (opt->flags & CEPH_OPT_NOMSGAUTH)
+               seq_puts(m, ",nocephx_require_signatures");
+       if ((opt->flags & CEPH_OPT_TCP_NODELAY) == 0)
+               seq_puts(m, ",notcp_nodelay");
 
        if (opt->name)
                seq_printf(m, ",name=%s", opt->name);
@@ -899,7 +903,7 @@ static int ceph_register_bdi(struct super_block *sb,
                        >> PAGE_SHIFT;
        else
                fsc->backing_dev_info.ra_pages =
-                       default_backing_dev_info.ra_pages;
+                       VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
 
        err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
                           atomic_long_inc_return(&bdi_seq));