summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan, Zheng <zyan@redhat.com>2016-01-25 10:44:33 +0800
committerIlya Dryomov <idryomov@gmail.com>2016-03-25 18:51:41 +0100
commit133e91566ced3e7154db9b68bb3ceb3b30f6900f (patch)
tree3464891773d1e448f2f1d732d965c42ca4c0e5e7
parentd1eee0c0e13a1eccde3418a12babf9d77860eee9 (diff)
downloadlinux-133e91566ced3e7154db9b68bb3ceb3b30f6900f.tar.gz
linux-133e91566ced3e7154db9b68bb3ceb3b30f6900f.tar.bz2
linux-133e91566ced3e7154db9b68bb3ceb3b30f6900f.zip
ceph: don't enable rbytes mount option by default
When rbytes mount option is enabled, directory size is recursive size. Recursive size is not updated instantly. This can cause directory size to change between successive stat(1) Signed-off-by: Yan, Zheng <zyan@redhat.com>
-rw-r--r--fs/ceph/super.c4
-rw-r--r--fs/ceph/super.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index c941fd1a8eb8..e82acc6f3ac3 100644
--- 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)
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 9c458eb52245..d4425b172bb6 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -37,8 +37,7 @@
#define CEPH_MOUNT_OPT_FSCACHE (1<<10) /* use fscache */
#define CEPH_MOUNT_OPT_NOPOOLPERM (1<<11) /* no pool permission check */
-#define CEPH_MOUNT_OPT_DEFAULT (CEPH_MOUNT_OPT_RBYTES | \
- CEPH_MOUNT_OPT_DCACHE)
+#define CEPH_MOUNT_OPT_DEFAULT CEPH_MOUNT_OPT_DCACHE
#define ceph_set_mount_opt(fsc, opt) \
(fsc)->mount_options->flags |= CEPH_MOUNT_OPT_##opt;