summaryrefslogtreecommitdiffstats
path: root/fs/nfs/internal.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-01-11 22:39:51 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-02-01 16:13:48 +0100
commit322b2b9032f4beba6f1c4158852a5a5b9ab841d7 (patch)
tree01e0d696fc636318c63543b46d988876ff329ee4 /fs/nfs/internal.h
parentSUNRPC: Nuke the tk_xprt macro (diff)
downloadlinux-322b2b9032f4beba6f1c4158852a5a5b9ab841d7.tar.xz
linux-322b2b9032f4beba6f1c4158852a5a5b9ab841d7.zip
Revert "NFS: add nfs_sb_deactive_async to avoid deadlock"
This reverts commit 324d003b0cd82151adbaecefef57b73f7959a469. The deadlock turned out to be caused by a workqueue limitation that has now been worked around in the RPC code (see comment in rpc_free_task). Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/internal.h')
-rw-r--r--fs/nfs/internal.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index f0e6c7df1a07..541c9ebdbc5a 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -329,7 +329,6 @@ extern int __init register_nfs_fs(void);
extern void __exit unregister_nfs_fs(void);
extern void nfs_sb_active(struct super_block *sb);
extern void nfs_sb_deactive(struct super_block *sb);
-extern void nfs_sb_deactive_async(struct super_block *sb);
/* namespace.c */
#define NFS_PATH_CANONICAL 1