summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-01-21 19:14:02 +0100
committerChristoph Hellwig <hch@lst.de>2015-02-02 18:09:38 +0100
commit2ab99ee12440e66ec1efd2a98599010471de785e (patch)
treee9d8946babd68a56c0c35bdf77d852ee74e346dc /fs/nfsd
parent6cae0a4648c0db2a74efb816cd2ce84390c90480 (diff)
downloadop-kernel-dev-2ab99ee12440e66ec1efd2a98599010471de785e.zip
op-kernel-dev-2ab99ee12440e66ec1efd2a98599010471de785e.tar.gz
fs: track fl_owner for leases
Just like for other lock types we should allow different owners to have a read lease on a file. Currently this can't happen, but with the addition of pNFS layout leases we'll need this feature. Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 370a53a..e6b354a 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -683,7 +683,7 @@ static void nfs4_put_deleg_lease(struct nfs4_file *fp)
spin_unlock(&fp->fi_lock);
if (filp) {
- vfs_setlease(filp, F_UNLCK, NULL, NULL);
+ vfs_setlease(filp, F_UNLCK, NULL, (void **)&fp);
fput(filp);
}
}
OpenPOWER on IntegriCloud