diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-30 12:38:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-30 12:38:13 -0700 |
| commit | 6f01c935d96cd4eb8bbbc5249bd9a754b6939e0a (patch) | |
| tree | 4221926366762159db02ee7f2b79658faa9ce9f9 /fs/ceph | |
| parent | 451819aa5ad0a22b23f0eb178816dc72b73ab903 (diff) | |
| parent | 2949e8427af3bb74a1e26354cb68c1700663c827 (diff) | |
Merge tag 'locks-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking updates from Jeff Layton:
"This starts with a couple of fixes for potential deadlocks in the
fowner/fasync handling.
The next patch removes the old mandatory locking code from the kernel
altogether.
The last patch cleans up rw_verify_area a bit more after the mandatory
locking removal"
* tag 'locks-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
fs: clean up after mandatory file locking support removal
fs: remove mandatory file locking support
fcntl: fix potential deadlock for &fasync_struct.fa_lock
fcntl: fix potential deadlocks for &fown_struct.lock
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/locks.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c index fa8a847743d0..bdeb271f47d9 100644 --- a/fs/ceph/locks.c +++ b/fs/ceph/locks.c @@ -240,9 +240,6 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl) if (!(fl->fl_flags & FL_POSIX)) return -ENOLCK; - /* No mandatory locks */ - if (__mandatory_lock(file->f_mapping->host) && fl->fl_type != F_UNLCK) - return -ENOLCK; dout("ceph_lock, fl_owner: %p\n", fl->fl_owner); |