diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2013-08-09 12:48:09 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-03 15:26:31 -0400 |
commit | 5a580e0ae2c0228aef4d10d649aaf387bebd70b6 (patch) | |
tree | b08bf4058e8f68a43eddbc67cc15c38c07118766 /fs | |
parent | 2a3eb2b97b1268891b0251df537c32daac295503 (diff) |
NFS: Clean up nfs4_setup_sequence()
Clean up: Both the NFSv4.0 and NFSv4.1 version of
nfs4_setup_sequence() are used only in fs/nfs/nfs4proc.c. No need
to keep global header declarations for either version.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/nfs4_fs.h | 11 | ||||
-rw-r--r-- | fs/nfs/nfs4proc.c | 16 |
2 files changed, 12 insertions, 15 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index d7bb59d5dd9c..0feb23815e38 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h | |||
@@ -247,9 +247,6 @@ static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *ser | |||
247 | return server->nfs_client->cl_session; | 247 | return server->nfs_client->cl_session; |
248 | } | 248 | } |
249 | 249 | ||
250 | extern int nfs4_setup_sequence(const struct nfs_server *server, | ||
251 | struct nfs4_sequence_args *args, struct nfs4_sequence_res *res, | ||
252 | struct rpc_task *task); | ||
253 | extern int nfs41_setup_sequence(struct nfs4_session *session, | 250 | extern int nfs41_setup_sequence(struct nfs4_session *session, |
254 | struct nfs4_sequence_args *args, struct nfs4_sequence_res *res, | 251 | struct nfs4_sequence_args *args, struct nfs4_sequence_res *res, |
255 | struct rpc_task *task); | 252 | struct rpc_task *task); |
@@ -278,14 +275,6 @@ static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *ser | |||
278 | return NULL; | 275 | return NULL; |
279 | } | 276 | } |
280 | 277 | ||
281 | static inline int nfs4_setup_sequence(const struct nfs_server *server, | ||
282 | struct nfs4_sequence_args *args, struct nfs4_sequence_res *res, | ||
283 | struct rpc_task *task) | ||
284 | { | ||
285 | rpc_call_start(task); | ||
286 | return 0; | ||
287 | } | ||
288 | |||
289 | static inline bool | 278 | static inline bool |
290 | is_ds_only_client(struct nfs_client *clp) | 279 | is_ds_only_client(struct nfs_client *clp) |
291 | { | 280 | { |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 069cd822aaad..f6be2264e39c 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -697,10 +697,10 @@ out_sleep: | |||
697 | } | 697 | } |
698 | EXPORT_SYMBOL_GPL(nfs41_setup_sequence); | 698 | EXPORT_SYMBOL_GPL(nfs41_setup_sequence); |
699 | 699 | ||
700 | int nfs4_setup_sequence(const struct nfs_server *server, | 700 | static int nfs4_setup_sequence(const struct nfs_server *server, |
701 | struct nfs4_sequence_args *args, | 701 | struct nfs4_sequence_args *args, |
702 | struct nfs4_sequence_res *res, | 702 | struct nfs4_sequence_res *res, |
703 | struct rpc_task *task) | 703 | struct rpc_task *task) |
704 | { | 704 | { |
705 | struct nfs4_session *session = nfs4_get_session(server); | 705 | struct nfs4_session *session = nfs4_get_session(server); |
706 | int ret = 0; | 706 | int ret = 0; |
@@ -783,6 +783,14 @@ static void nfs4_set_sequence_privileged(struct nfs4_sequence_args *args) | |||
783 | { | 783 | { |
784 | } | 784 | } |
785 | 785 | ||
786 | static int nfs4_setup_sequence(const struct nfs_server *server, | ||
787 | struct nfs4_sequence_args *args, | ||
788 | struct nfs4_sequence_res *res, | ||
789 | struct rpc_task *task) | ||
790 | { | ||
791 | rpc_call_start(task); | ||
792 | return 0; | ||
793 | } | ||
786 | 794 | ||
787 | static int nfs4_sequence_done(struct rpc_task *task, | 795 | static int nfs4_sequence_done(struct rpc_task *task, |
788 | struct nfs4_sequence_res *res) | 796 | struct nfs4_sequence_res *res) |