diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-26 10:34:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-26 10:34:42 -0700 |
| commit | 6467dfdfc94cfefed728bb1d9eb78493760469e0 (patch) | |
| tree | 6c79b99509193f523d3bb51c1f900ca41431017b /fs/ceph/dir.c | |
| parent | 732c275394305b6d71b4bb74f5432d2d91f05257 (diff) | |
| parent | 3ceccb14f5576e02b81cc8b105ab81f224bd87f6 (diff) | |
| download | linux-6467dfdfc94cfefed728bb1d9eb78493760469e0.tar.gz linux-6467dfdfc94cfefed728bb1d9eb78493760469e0.tar.bz2 linux-6467dfdfc94cfefed728bb1d9eb78493760469e0.zip | |
Merge tag 'ceph-for-6.11-rc1' of https://github.com/ceph/ceph-client
Pull ceph updates from Ilya Dryomov:
"A small patchset to address bogus I/O errors and ultimately an
assertion failure in the face of watch errors with -o exclusive
mappings in RBD marked for stable and some assorted CephFS fixes"
* tag 'ceph-for-6.11-rc1' of https://github.com/ceph/ceph-client:
rbd: don't assume rbd_is_lock_owner() for exclusive mappings
rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
ceph: fix incorrect kmalloc size of pagevec mempool
ceph: periodically flush the cap releases
ceph: convert comma to semicolon in __ceph_dentry_dir_lease_touch()
ceph: use cap_wait_list only if debugfs is enabled
Diffstat (limited to 'fs/ceph/dir.c')
| -rw-r--r-- | fs/ceph/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 5aadc56e0cc0..18c72b305858 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -1589,7 +1589,7 @@ void __ceph_dentry_dir_lease_touch(struct ceph_dentry_info *di) } spin_lock(&mdsc->dentry_list_lock); - __dentry_dir_lease_touch(mdsc, di), + __dentry_dir_lease_touch(mdsc, di); spin_unlock(&mdsc->dentry_list_lock); } |