diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-29 23:59:54 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-29 23:59:54 +0300 |
commit | e2fce151d2b4bd9722b3344ae381c768d249761f (patch) | |
tree | fffb6eb91bf2258e68048f17c865ac253fcd521e /fs | |
parent | 835e36b1197a4f066d0254c897f2c8b455cbb581 (diff) | |
parent | fb33c114d3ed5bdac230716f5b0a93b56b92a90d (diff) | |
download | linux-e2fce151d2b4bd9722b3344ae381c768d249761f.tar.xz |
Merge tag 'ceph-for-5.7-rc8' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"Cache tiering and cap handling fixups, both marked for stable"
* tag 'ceph-for-5.7-rc8' of git://github.com/ceph/ceph-client:
ceph: flush release queue when handling caps for unknown inode
libceph: ignore pool overlay and cache logic on redirects
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ceph/caps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 5f3aa4d607de..f1acde6fb9a6 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -3991,7 +3991,7 @@ void ceph_handle_caps(struct ceph_mds_session *session, __ceph_queue_cap_release(session, cap); spin_unlock(&session->s_cap_lock); } - goto done; + goto flush_cap_releases; } /* these will work even if we don't have a cap yet */ |