ceph: don't enable rbytes mount option by default

[linux-2.6-block.git] / fs / ceph / super.c

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index ca4d5e8457f1e5340330bb225b4da84c88727dc5..e82acc6f3ac344a1a158216b5d1164192626b6f0 100644 (file)
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -439,8 +439,8 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root)
 
        if (fsopt->flags & CEPH_MOUNT_OPT_DIRSTAT)
                seq_puts(m, ",dirstat");
-       if ((fsopt->flags & CEPH_MOUNT_OPT_RBYTES) == 0)
-               seq_puts(m, ",norbytes");
+       if ((fsopt->flags & CEPH_MOUNT_OPT_RBYTES))
+               seq_puts(m, ",rbytes");
        if (fsopt->flags & CEPH_MOUNT_OPT_NOASYNCREADDIR)
                seq_puts(m, ",noasyncreaddir");
        if ((fsopt->flags & CEPH_MOUNT_OPT_DCACHE) == 0)
@@ -530,7 +530,7 @@ static struct ceph_fs_client *create_fs_client(struct ceph_mount_options *fsopt,
                goto fail;
        }
        fsc->client->extra_mon_dispatch = extra_mon_dispatch;
-       fsc->client->monc.want_mdsmap = 1;
+       ceph_monc_want_map(&fsc->client->monc, CEPH_SUB_MDSMAP, 0, true);
 
        fsc->mount_options = fsopt;