diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 16:40:25 +0200 |
|---|---|---|
| committer | Jeff Layton <jlayton@primarydata.com> | 2014-10-07 20:06:12 +0200 |
| commit | e6f5c78930e409f3a6b37f5484313a416359ac7f (patch) | |
| tree | e5465ac34a9251be44276f135c8a4f0a5ba4d42e /fs/nfsd | |
| parent | nfsd: don't keep a pointer to the lease in nfs4_file (diff) | |
| download | linux-e6f5c78930e409f3a6b37f5484313a416359ac7f.tar.xz linux-e6f5c78930e409f3a6b37f5484313a416359ac7f.zip | |
locks: plumb a "priv" pointer into the setlease routines
In later patches, we're going to add a new lock_manager_operation to
finish setting up the lease while still holding the i_lock. To do
this, we'll need to pass a little bit of info in the fcntl setlease
case (primarily an fasync structure). Plumb the extra pointer into
there in advance of that.
We declare this pointer as a void ** to make it clear that this is
private info, and that the caller isn't required to set this unless
the lm_setup specifically requires it.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 188cd68aefb6..7c803db2a027 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -686,7 +686,7 @@ static void nfs4_put_deleg_lease(struct nfs4_file *fp) spin_unlock(&fp->fi_lock); if (filp) { - vfs_setlease(filp, F_UNLCK, NULL); + vfs_setlease(filp, F_UNLCK, NULL, NULL); fput(filp); } } @@ -3792,7 +3792,7 @@ static int nfs4_setlease(struct nfs4_delegation *dp) } fl->fl_file = filp; ret = fl; - status = vfs_setlease(filp, fl->fl_type, &ret); + status = vfs_setlease(filp, fl->fl_type, &fl, NULL); if (status) { locks_free_lock(fl); goto out_fput; |