diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 09:06:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-01 09:06:53 -0700 |
| commit | 9ac211426fb6747c92d570647e2ce889e33cbffd (patch) | |
| tree | c9d021ff260415fa63071b37ae01f01e81334bb5 /fs/ceph | |
| parent | ad98a9246616e736504d1ebc2f3f35c2c0dcb806 (diff) | |
| parent | 482e00075d660a16de822686a4be4f7c0e11e5e2 (diff) | |
Merge tag 'locks-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking updates from Jeff Layton:
"Most of this is just follow-on cleanup work of documentation and
comments from the mandatory locking removal in v5.15.
The only real functional change is that LOCK_MAND flock() support is
also being removed, as it has basically been non-functional since the
v2.5 days"
* tag 'locks-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
fs: remove leftover comments from mandatory locking removal
locks: remove changelog comments
docs: fs: locks.rst: update comment about mandatory file locking
Documentation: remove reference to now removed mandatory-locking doc
locks: remove LOCK_MAND flock lock support
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 bdeb271f47d9..d8c31069fbf2 100644 --- a/fs/ceph/locks.c +++ b/fs/ceph/locks.c @@ -302,9 +302,6 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl) if (!(fl->fl_flags & FL_FLOCK)) return -ENOLCK; - /* No mandatory locks */ - if (fl->fl_type & LOCK_MAND) - return -EOPNOTSUPP; dout("ceph_flock, fl_file: %p\n", fl->fl_file); |