summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2015-09-24 08:56:29 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-10-21 16:49:22 -0400
commitf765bf762bb57d8bda825e5440a4801232cd835f (patch)
treef8e9f278eb0090b31709c3f644453bf820a8a51e
parent8c163d8e5ad2bd7982904bbe568706e1b0bbf60a (diff)
NFS: Remove the left function defines in callback.h
Commit 778be232a207 "NFS do not find client in NFSv4 pg_authenticate" has remove the define and using of nfs4_set_callback_sessionid(), and commit 36281caa839f "NFSv4: Further clean-ups of delegation stateid validation" has update the checking of stateid, and move the code to nfs4proc.c. This patch remove those function defines left in callback.h Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--fs/nfs/callback.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index cbcc903b8985..ff8195bd75ea 100644
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -117,9 +117,6 @@ extern __be32 nfs4_callback_sequence(struct cb_sequenceargs *args,
117 struct cb_sequenceres *res, 117 struct cb_sequenceres *res,
118 struct cb_process_state *cps); 118 struct cb_process_state *cps);
119 119
120extern int nfs41_validate_delegation_stateid(struct nfs_delegation *delegation,
121 const nfs4_stateid *stateid);
122
123#define RCA4_TYPE_MASK_RDATA_DLG 0 120#define RCA4_TYPE_MASK_RDATA_DLG 0
124#define RCA4_TYPE_MASK_WDATA_DLG 1 121#define RCA4_TYPE_MASK_WDATA_DLG 1
125#define RCA4_TYPE_MASK_DIR_DLG 2 122#define RCA4_TYPE_MASK_DIR_DLG 2
@@ -191,9 +188,6 @@ extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy,
191#if IS_ENABLED(CONFIG_NFS_V4) 188#if IS_ENABLED(CONFIG_NFS_V4)
192extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt); 189extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt);
193extern void nfs_callback_down(int minorversion, struct net *net); 190extern void nfs_callback_down(int minorversion, struct net *net);
194extern int nfs4_validate_delegation_stateid(struct nfs_delegation *delegation,
195 const nfs4_stateid *stateid);
196extern int nfs4_set_callback_sessionid(struct nfs_client *clp);
197#endif /* CONFIG_NFS_V4 */ 191#endif /* CONFIG_NFS_V4 */
198/* 192/*
199 * nfs41: Callbacks are expected to not cause substantial latency, 193 * nfs41: Callbacks are expected to not cause substantial latency,