| Message ID | 20230927013009.151922-1-xiubli@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Revert "ceph: enable async dirops by default" | expand |
On Wed, Sep 27, 2023 at 7:02 AM <xiubli@redhat.com> wrote: > > From: Xiubo Li <xiubli@redhat.com> > > This reverts commit f7a67b463fb83a4b9b11ceaa8ec4950b8fb7f902. > > The async dirop is buggy and introduce several bugs in MDS side > and not stable yet. Let's disable it for now and enable it later > when it's ready. > > Signed-off-by: Xiubo Li <xiubli@redhat.com> > --- > fs/ceph/super.c | 4 ++-- > fs/ceph/super.h | 3 +-- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/fs/ceph/super.c b/fs/ceph/super.c > index 5ec102f6b1ac..2bf6ccc9887b 100644 > --- a/fs/ceph/super.c > +++ b/fs/ceph/super.c > @@ -742,8 +742,8 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root) > if (fsopt->flags & CEPH_MOUNT_OPT_CLEANRECOVER) > seq_show_option(m, "recover_session", "clean"); > > - if (!(fsopt->flags & CEPH_MOUNT_OPT_ASYNC_DIROPS)) > - seq_puts(m, ",wsync"); > + if (fsopt->flags & CEPH_MOUNT_OPT_ASYNC_DIROPS) > + seq_puts(m, ",nowsync"); > if (fsopt->flags & CEPH_MOUNT_OPT_NOPAGECACHE) > seq_puts(m, ",nopagecache"); > if (fsopt->flags & CEPH_MOUNT_OPT_SPARSEREAD) > diff --git a/fs/ceph/super.h b/fs/ceph/super.h > index 7f4b62182a5d..a5476892896c 100644 > --- a/fs/ceph/super.h > +++ b/fs/ceph/super.h > @@ -47,8 +47,7 @@ > > #define CEPH_MOUNT_OPT_DEFAULT \ > (CEPH_MOUNT_OPT_DCACHE | \ > - CEPH_MOUNT_OPT_NOCOPYFROM | \ > - CEPH_MOUNT_OPT_ASYNC_DIROPS) > + CEPH_MOUNT_OPT_NOCOPYFROM) > > #define ceph_set_mount_opt(fsc, opt) \ > (fsc)->mount_options->flags |= CEPH_MOUNT_OPT_##opt > -- > 2.41.0 > LGTM. Requires an explanation on the issue and its impact - let's add that in.
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 5ec102f6b1ac..2bf6ccc9887b 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -742,8 +742,8 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root) if (fsopt->flags & CEPH_MOUNT_OPT_CLEANRECOVER) seq_show_option(m, "recover_session", "clean"); - if (!(fsopt->flags & CEPH_MOUNT_OPT_ASYNC_DIROPS)) - seq_puts(m, ",wsync"); + if (fsopt->flags & CEPH_MOUNT_OPT_ASYNC_DIROPS) + seq_puts(m, ",nowsync"); if (fsopt->flags & CEPH_MOUNT_OPT_NOPAGECACHE) seq_puts(m, ",nopagecache"); if (fsopt->flags & CEPH_MOUNT_OPT_SPARSEREAD) diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 7f4b62182a5d..a5476892896c 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -47,8 +47,7 @@ #define CEPH_MOUNT_OPT_DEFAULT \ (CEPH_MOUNT_OPT_DCACHE | \ - CEPH_MOUNT_OPT_NOCOPYFROM | \ - CEPH_MOUNT_OPT_ASYNC_DIROPS) + CEPH_MOUNT_OPT_NOCOPYFROM) #define ceph_set_mount_opt(fsc, opt) \ (fsc)->mount_options->flags |= CEPH_MOUNT_OPT_##opt