diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2023-01-06 12:11:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2023-01-06 12:11:41 -0800 |
| commit | 5c1a712f71286b8435d48e3be5f8faf39a4cc837 (patch) | |
| tree | 6d8a6f981569ac5f914ea389ec3286f274c4721d /fs/ceph/super.h | |
| parent | Merge tag 'fixes_for_v6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | ceph: avoid use-after-free in ceph_fl_release_lock() (diff) | |
| download | linux-5c1a712f71286b8435d48e3be5f8faf39a4cc837.tar.gz linux-5c1a712f71286b8435d48e3be5f8faf39a4cc837.tar.bz2 linux-5c1a712f71286b8435d48e3be5f8faf39a4cc837.zip | |
Merge tag 'ceph-for-6.2-rc3' of https://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"Two file locking fixes from Xiubo"
* tag 'ceph-for-6.2-rc3' of https://github.com/ceph/ceph-client:
ceph: avoid use-after-free in ceph_fl_release_lock()
ceph: switch to vfs_inode_has_locks() to fix file lock bug
Diffstat (limited to 'fs/ceph/super.h')
| -rw-r--r-- | fs/ceph/super.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 30bdb391a0dc..0ed3be75bb9a 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -790,7 +790,6 @@ struct ceph_file_info { struct list_head rw_contexts; u32 filp_gen; - atomic_t num_locks; }; struct ceph_dir_file_info { |