diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 14:15:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 14:15:19 -0700 |
| commit | 32b7a567c8d860b2d79067129ac2db4c4d2df3a0 (patch) | |
| tree | 82c2ec3d29c66fd65fa5770fa126ae3ee86c4ae6 /fs/nfs/nfs4renewd.c | |
| parent | 36a07902c2134649c4af7f07980413ffb1a56085 (diff) | |
| parent | 3050141bae57984dd660e6861632ccf9b8bca77e (diff) | |
| download | blackbird-op-linux-32b7a567c8d860b2d79067129ac2db4c4d2df3a0.tar.gz blackbird-op-linux-32b7a567c8d860b2d79067129ac2db4c4d2df3a0.zip | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFSv4: Kill nfs4_renewd_prepare_shutdown()
NFSv4: Fix the referral mount code
nfs: Avoid overrun when copying client IP address string
NFS: Fix port initialisation in nfs_remount()
NFS: Fix port and mountport display in /proc/self/mountinfo
NFS: Fix a default mount regression...
Diffstat (limited to 'fs/nfs/nfs4renewd.c')
| -rw-r--r-- | fs/nfs/nfs4renewd.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c index e27c6cef18f2..0156c01c212c 100644 --- a/fs/nfs/nfs4renewd.c +++ b/fs/nfs/nfs4renewd.c @@ -127,12 +127,6 @@ nfs4_schedule_state_renewal(struct nfs_client *clp) } void -nfs4_renewd_prepare_shutdown(struct nfs_server *server) -{ - cancel_delayed_work(&server->nfs_client->cl_renewd); -} - -void nfs4_kill_renewd(struct nfs_client *clp) { cancel_delayed_work_sync(&clp->cl_renewd); |
