diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-10-30 23:41:26 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-01-04 22:49:26 +0100 |
| commit | e63eb9375089f9d2041305d04c3f33a194e0e014 (patch) | |
| tree | c6c3b73e8af30267bfcddc5e128b09df6ea576c9 /fs/nfsd | |
| parent | svcrpc: ensure cache_check caller sees updated entry (diff) | |
| download | linux-e63eb9375089f9d2041305d04c3f33a194e0e014.tar.xz linux-e63eb9375089f9d2041305d04c3f33a194e0e014.zip | |
nfsd4: eliminate lease delete callback
nfsd controls the lifetime of the lease, not the lock code, so there's
no need for this callback on lease destruction.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index b82e36862044..2e44ad2539ab 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2296,23 +2296,6 @@ void nfsd_break_deleg_cb(struct file_lock *fl) } /* - * The file_lock is being reapd. - * - * Called by locks_free_lock() with lock_flocks() held. - */ -static -void nfsd_release_deleg_cb(struct file_lock *fl) -{ - struct nfs4_delegation *dp = (struct nfs4_delegation *)fl->fl_owner; - - dprintk("NFSD nfsd_release_deleg_cb: fl %p dp %p dl_count %d\n", fl,dp, atomic_read(&dp->dl_count)); - - if (!(fl->fl_flags & FL_LEASE) || !dp) - return; - dp->dl_flock = NULL; -} - -/* * Called from setlease() with lock_flocks() held */ static @@ -2341,7 +2324,6 @@ int nfsd_change_deleg_cb(struct file_lock **onlist, int arg) static const struct lock_manager_operations nfsd_lease_mng_ops = { .fl_break = nfsd_break_deleg_cb, - .fl_release_private = nfsd_release_deleg_cb, .fl_mylease = nfsd_same_client_deleg_cb, .fl_change = nfsd_change_deleg_cb, }; |