diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2014-09-01 13:12:07 +0200 |
|---|---|---|
| committer | Jeff Layton <jlayton@primarydata.com> | 2014-10-07 20:06:13 +0200 |
| commit | c45198eda2794bb72601c9f96266d8b95db66dd5 (patch) | |
| tree | 59c973d0d5356e113efd22ece677267cbc07e0af /fs/nfsd/nfs4state.c | |
| parent | locks: move i_lock acquisition into generic_*_lease handlers (diff) | |
| download | linux-c45198eda2794bb72601c9f96266d8b95db66dd5.tar.xz linux-c45198eda2794bb72601c9f96266d8b95db66dd5.zip | |
locks: move freeing of leases outside of i_lock
There was only one place where we still could free a file_lock while
holding the i_lock -- lease_modify. Add a new list_head argument to the
lm_change operation, pass in a private list when calling it, and fix
those callers to dispose of the list once the lock has been dropped.
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, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5349528136e2..604ab6decd28 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3427,11 +3427,11 @@ static void nfsd_break_deleg_cb(struct file_lock *fl) spin_unlock(&fp->fi_lock); } -static -int nfsd_change_deleg_cb(struct file_lock **onlist, int arg) +static int +nfsd_change_deleg_cb(struct file_lock **onlist, int arg, struct list_head *dispose) { if (arg & F_UNLCK) - return lease_modify(onlist, arg); + return lease_modify(onlist, arg, dispose); else return -EAGAIN; } |