diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-06 21:11:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-06 21:11:41 +0100 |
| commit | 5c1a712f71286b8435d48e3be5f8faf39a4cc837 (patch) | |
| tree | 6d8a6f981569ac5f914ea389ec3286f274c4721d /include | |
| 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.xz 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 'include')
| -rw-r--r-- | include/linux/fs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 066555ad1bf8..c1769a2c5d70 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1119,6 +1119,9 @@ struct file_lock { int state; /* state of grant or error if -ve */ unsigned int debug_id; } afs; + struct { + struct inode *inode; + } ceph; } fl_u; } __randomize_layout; |