diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 16:55:47 +0200 |
|---|---|---|
| committer | Jeff Layton <jlayton@primarydata.com> | 2014-10-07 20:06:12 +0200 |
| commit | 1c7dd2ff430fa14b45c9def54468e3a25ab8342b (patch) | |
| tree | a80695c6ca57be5da96c63b67d1264507bfe509e /fs/nfsd/nfs4state.c | |
| parent | locks: plumb a "priv" pointer into the setlease routines (diff) | |
| download | linux-1c7dd2ff430fa14b45c9def54468e3a25ab8342b.tar.xz linux-1c7dd2ff430fa14b45c9def54468e3a25ab8342b.zip | |
locks: define a lm_setup handler for leases
...and move the fasync setup into it for fcntl lease calls. At the same
time, change the semantics of how the file_lock double-pointer is
handled. Up until now, on a successful lease return you got a pointer to
the lock on the list. This is bad, since that pointer can no longer be
relied on as valid once the inode->i_lock has been released.
Change the code to instead just zero out the pointer if the lease we
passed in ended up being used. Then the callers can just check to see
if it's NULL after the call and free it if it isn't.
The priv argument has the same semantics. The lm_setup function can
zero the pointer out to signal to the caller that it should not be
freed after the function returns.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 7c803db2a027..5349528136e2 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3793,12 +3793,10 @@ static int nfs4_setlease(struct nfs4_delegation *dp) fl->fl_file = filp; ret = fl; status = vfs_setlease(filp, fl->fl_type, &fl, NULL); - if (status) { + if (fl) locks_free_lock(fl); + if (status) goto out_fput; - } - if (ret != fl) - locks_free_lock(fl); spin_lock(&state_lock); spin_lock(&fp->fi_lock); /* Did the lease get broken before we took the lock? */ |