ceph: properly wake up cap waiter after releasing revoked caps
PATCH 1/1 ceph: properly wake up cap waiter after releasing revoked caps
arg->wake can never be true. the bug was introduced by commit 0c4b255369bcf "ceph: reorganize __send_cap for less spinlock abuse"
Signed-off-by "Yan, Zheng" <[email protected]>
--- fs/ceph/caps.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
fs/ceph/caps.c +6 -7
@@ -1376,6 +1376,12 @@ static void __prep_cap(struct cap_msg_args *arg, struct ceph_cap *cap, ci->i_ceph_flags &= ~CEPH_I_FLUSH ; cap->issued &= retain;/* drop bits we don't want */ +/* +* Wake up any waiters on wanted -> needed transition. This is due to +* the weird transition from buffered to sync IO... we need to flush +* dirty pages _before_ allowing sync writes to avoid reordering. +*/ + arg->wake = cap->implemented & ~cap->issued; cap->implemented &= cap->issued | used; cap->mds_wanted = want;
@@ -1439,13 +1445,6 @@ static void __prep_cap(struct cap_msg_args *arg, struct ceph_cap *cap, } } arg->flags = flags; - -/* -* Wake up any waiters on wanted -> needed transition. This is due to -* the weird transition from buffered to sync IO... we need to flush -* dirty pages _before_ allowing sync writes to avoid reordering. -*/ - arg->wake = cap->implemented & ~cap->issued; }/*
Signature · 1 line
2.21.3
Quoted 29 lines · Zheng
arg->wakecan never be true. the bug was introduced by commit0c4b255369bcf"ceph: reorganize__send_capfor less spinlock abuse"Signed-off-by "Yan, Zheng" <[email protected]>--- fs/ceph/caps.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)fs/ceph/caps.c +6
-0@@ -1376,6 +1376,12 @@ static void __prep_cap(struct cap_msg_args *arg, struct ceph_cap *cap, ci->i_ceph_flags &= ~CEPH_I_FLUSH ; cap->issued &= retain;/* drop bits we don't want */ +/* +* Wake up any waiters on wanted -> needed transition. This is due to +* the weird transition from buffered to sync IO... we need to flush +* dirty pages _before_ allowing sync writes to avoid reordering. +*/ + arg->wake = cap->implemented & ~cap->issued; cap->implemented &= cap->issued | used; cap->mds_wanted = want;@@ -1439,13 +1445,6 @@ static void __prep_cap(struct cap_msg_args *arg, struct ceph_cap *cap, } } arg->flags = flags;
fs/ceph/caps.c static void __prep_cap(struct cap_msg_args *arg, struct ceph_cap *cap, · line 1450
Quoted 10 lines
fs/ceph/caps.c +0
-7- -/* -* Wake up any waiters on wanted -> needed transition. This is due to -* the weird transition from buffered to sync IO... we need to flush -* dirty pages _before_ allowing sync writes to avoid reordering. -*/ - arg->wake = cap->implemented & ~cap->issued; }/*
Good catch! Merged (with a small revision to the commit message).
Signature · 1 line
Jeff Layton <[email protected]>