Commit 133e9156 authored Jan 25, 2016 by Yan, Zheng Committed by Ilya Dryomov Mar 25, 2016

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>

parent d1eee0c0

fs/ceph/super.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -439,8 +439,8 @@ static int ceph_show_options(struct seq_file m, struct dentry root)

	if (fsopt->flags & CEPH_MOUNT_OPT_DIRSTAT)		if (fsopt->flags & CEPH_MOUNT_OPT_DIRSTAT)
	seq_puts(m, ",dirstat");		seq_puts(m, ",dirstat");
	if ((fsopt->flags & CEPH_MOUNT_OPT_RBYTES) == 0)		if ((fsopt->flags & CEPH_MOUNT_OPT_RBYTES))
	seq_puts(m, ",norbytes");		seq_puts(m, ",rbytes");
	if (fsopt->flags & CEPH_MOUNT_OPT_NOASYNCREADDIR)		if (fsopt->flags & CEPH_MOUNT_OPT_NOASYNCREADDIR)
	seq_puts(m, ",noasyncreaddir");		seq_puts(m, ",noasyncreaddir");
	if ((fsopt->flags & CEPH_MOUNT_OPT_DCACHE) == 0)		if ((fsopt->flags & CEPH_MOUNT_OPT_DCACHE) == 0)

fs/ceph/super.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -37,8 +37,7 @@
	#define CEPH_MOUNT_OPT_FSCACHE (1<<10) /* use fscache */		#define CEPH_MOUNT_OPT_FSCACHE (1<<10) /* use fscache */
	#define CEPH_MOUNT_OPT_NOPOOLPERM (1<<11) /* no pool permission check */		#define CEPH_MOUNT_OPT_NOPOOLPERM (1<<11) /* no pool permission check */

	#define CEPH_MOUNT_OPT_DEFAULT (CEPH_MOUNT_OPT_RBYTES \| \		#define CEPH_MOUNT_OPT_DEFAULT CEPH_MOUNT_OPT_DCACHE
	CEPH_MOUNT_OPT_DCACHE)

	#define ceph_set_mount_opt(fsc, opt) \		#define ceph_set_mount_opt(fsc, opt) \
	(fsc)->mount_options->flags \|= CEPH_MOUNT_OPT_##opt;		(fsc)->mount_options->flags \|= CEPH_MOUNT_OPT_##opt;