Skip to content

Commit f7a67b4

Browse files
jtlaytonidryomov
authored andcommitted
ceph: enable async dirops by default
Async dirops have been supported in mainline kernels for quite some time now, and we've recently (as of June) started doing regular testing in teuthology with '-o nowsync'. There were a few issues, but we've sorted those out now. Enable async dirops by default, and change /proc/mounts to show "wsync" when they are disabled rather than "nowsync" when they are enabled. Signed-off-by: Jeff Layton <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]> Signed-off-by: Ilya Dryomov <[email protected]>
1 parent a341131 commit f7a67b4

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

fs/ceph/super.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root)
577577
if (fsopt->flags & CEPH_MOUNT_OPT_CLEANRECOVER)
578578
seq_show_option(m, "recover_session", "clean");
579579

580-
if (fsopt->flags & CEPH_MOUNT_OPT_ASYNC_DIROPS)
581-
seq_puts(m, ",nowsync");
580+
if (!(fsopt->flags & CEPH_MOUNT_OPT_ASYNC_DIROPS))
581+
seq_puts(m, ",wsync");
582582

583583
if (fsopt->wsize != CEPH_MAX_WRITE_SIZE)
584584
seq_printf(m, ",wsize=%u", fsopt->wsize);

fs/ceph/super.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848

4949
#define CEPH_MOUNT_OPT_DEFAULT \
5050
(CEPH_MOUNT_OPT_DCACHE | \
51-
CEPH_MOUNT_OPT_NOCOPYFROM)
51+
CEPH_MOUNT_OPT_NOCOPYFROM | \
52+
CEPH_MOUNT_OPT_ASYNC_DIROPS)
5253

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

0 commit comments

Comments
 (0)