diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 10:18:45 -0400 |
|---|---|---|
| committer | Jeff Layton <jlayton@primarydata.com> | 2014-10-07 14:06:12 -0400 |
| commit | 0efaa7e82f02fe69c05ad28e905f31fc86e6f08e (patch) | |
| tree | bf7e9d91c5800da259fa3ee9907287ba2b2d6cc1 /fs/nfsd | |
| parent | 415b96c5a1fe31ed9deb0618e95ecbb1df3de54c (diff) | |
| download | blackbird-op-linux-0efaa7e82f02fe69c05ad28e905f31fc86e6f08e.tar.gz blackbird-op-linux-0efaa7e82f02fe69c05ad28e905f31fc86e6f08e.zip | |
locks: generic_delete_lease doesn't need a file_lock at all
Ensure that it's OK to pass in a NULL file_lock double pointer on
a F_UNLCK request and convert the vfs_setlease F_UNLCK callers to
do just that.
Finally, turn the BUG_ON in generic_setlease into a WARN_ON_ONCE
with an error return. That's a problem we can handle without
crashing the box if it occurs.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5bb4952faf5b..89d54e505155 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -690,7 +690,7 @@ static void nfs4_put_deleg_lease(struct nfs4_file *fp) spin_unlock(&fp->fi_lock); if (filp) { - vfs_setlease(filp, F_UNLCK, &fl); + vfs_setlease(filp, F_UNLCK, NULL); fput(filp); } } |
