diff options
author | Jeff Layton <jlayton@kernel.org> | 2021-09-10 15:36:29 -0400 |
---|---|---|
committer | Jeff Layton <jlayton@kernel.org> | 2021-09-10 16:21:44 -0400 |
commit | 90f7d7a0d0d68623b5f7df5621a8d54d9518fcc4 (patch) | |
tree | 45d9848be89c64360b82aa49fbb19af46eb46164 /fs/nfs/file.c | |
parent | bf9f243f23e6623f310ba03fbb14e10ec3a61290 (diff) | |
download | linux-90f7d7a0d0d68623b5f7df5621a8d54d9518fcc4.tar.bz2 |
locks: remove LOCK_MAND flock lock support
As best I can tell, the logic for these has been broken for a long time
(at least before the move to git), such that they never conflict with
anything. Also, nothing checks for these flags and prevented opens or
read/write behavior on the files. They don't seem to do anything.
Given that, we can rip these symbols out of the kernel, and just make
flock(2) return 0 when LOCK_MAND is set in order to preserve existing
behavior.
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r-- | fs/nfs/file.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index aa353fd58240..24e7dccce355 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -843,15 +843,6 @@ int nfs_flock(struct file *filp, int cmd, struct file_lock *fl) if (!(fl->fl_flags & FL_FLOCK)) return -ENOLCK; - /* - * The NFSv4 protocol doesn't support LOCK_MAND, which is not part of - * any standard. In principle we might be able to support LOCK_MAND - * on NFSv2/3 since NLMv3/4 support DOS share modes, but for now the - * NFS code is not set up for it. - */ - if (fl->fl_type & LOCK_MAND) - return -EINVAL; - if (NFS_SERVER(inode)->flags & NFS_MOUNT_LOCAL_FLOCK) is_local = 1; |