aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/internal.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2009-12-05 19:32:19 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-12-05 19:32:19 -0500
commitd61e612a728fb9bf848c4383f8f6645e822d5b57 (patch)
treeb4024efc797fa3b992b042f484574c1d43893a61 /fs/nfs/internal.h
parentf26468fb9384e73fb357d2e84d3e9c88c7d1129d (diff)
NFSv41: Clean up slot table management
We no longer need to maintain a distinction between nfs41_sequence_done and nfs41_sequence_free_slot. This fixes a number of slot table leakages in the NFSv4.1 code. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/internal.h')
-rw-r--r--fs/nfs/internal.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 83a9284b83c7..b1a020c11724 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -197,8 +197,7 @@ extern const u32 nfs41_maxwrite_overhead;
197#endif 197#endif
198 198
199/* nfs4proc.c */ 199/* nfs4proc.c */
200extern void nfs4_restart_rpc(struct rpc_task *, const struct nfs_client *, 200extern void nfs4_restart_rpc(struct rpc_task *, const struct nfs_client *);
201 struct nfs4_sequence_res *);
202#ifdef CONFIG_NFS_V4 201#ifdef CONFIG_NFS_V4
203extern struct rpc_procinfo nfs4_procedures[]; 202extern struct rpc_procinfo nfs4_procedures[];
204#endif 203#endif
@@ -275,20 +274,6 @@ extern int _nfs4_call_sync_session(struct nfs_server *server,
275 struct nfs4_sequence_res *res, 274 struct nfs4_sequence_res *res,
276 int cache_reply); 275 int cache_reply);
277 276
278#ifdef CONFIG_NFS_V4_1
279extern void nfs41_sequence_free_slot(const struct nfs_client *,
280 struct nfs4_sequence_res *res);
281#endif /* CONFIG_NFS_V4_1 */
282
283static inline void nfs4_sequence_free_slot(const struct nfs_client *clp,
284 struct nfs4_sequence_res *res)
285{
286#ifdef CONFIG_NFS_V4_1
287 if (nfs4_has_session(clp))
288 nfs41_sequence_free_slot(clp, res);
289#endif /* CONFIG_NFS_V4_1 */
290}
291
292/* 277/*
293 * Determine the device name as a string 278 * Determine the device name as a string
294 */ 279 */