diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2021-08-20 23:02:06 +0200 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2021-08-26 21:32:28 +0200 |
| commit | bb0a55bb7148a49e549ee992200860e7a040d3a5 (patch) | |
| tree | c61a9d239c8cb2e1b86b49412d8d19b94081675b /fs/nfs | |
| parent | lockd: don't attempt blocking locks on nfs reexports (diff) | |
| download | linux-bb0a55bb7148a49e549ee992200860e7a040d3a5.tar.xz linux-bb0a55bb7148a49e549ee992200860e7a040d3a5.zip | |
nfs: don't allow reexport reclaims
In the reexport case, nfsd is currently passing along locks with the
reclaim bit set. The client sends a new lock request, which is granted
if there's currently no conflict--even if it's possible a conflicting
lock could have been briefly held in the interim.
We don't currently have any way to safely grant reclaim, so for now
let's just deny them all.
I'm doing this by passing the reclaim bit to nfs and letting it fail the
call, with the idea that eventually the client might be able to do
something more forgiving here.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Acked-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/file.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 1fef107961bc..7411658f8b05 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -806,6 +806,9 @@ int nfs_lock(struct file *filp, int cmd, struct file_lock *fl) nfs_inc_stats(inode, NFSIOS_VFSLOCK); + if (fl->fl_flags & FL_RECLAIM) + return -ENOGRACE; + /* No mandatory locks over NFS */ if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK) goto out_err; |