Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5a580e0ae2c0228aef4d10d649aaf387bebd70b6

Authored by Chuck Lever
Committed by Trond Myklebust
1 parent 2a3eb2b97b
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 12 additions and 15 deletions Side-by-side Diff

... ... @@ -247,9 +247,6 @@
247 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 250 extern int nfs41_setup_sequence(struct nfs4_session *session,
254 251 struct nfs4_sequence_args *args, struct nfs4_sequence_res *res,
255 252 struct rpc_task *task);
... ... @@ -276,14 +273,6 @@
276 273 static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *server)
277 274 {
278 275 return NULL;
279   -}
280   -
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 276 }
288 277  
289 278 static inline bool
... ... @@ -697,10 +697,10 @@
697 697 }
698 698 EXPORT_SYMBOL_GPL(nfs41_setup_sequence);
699 699  
700   -int nfs4_setup_sequence(const struct nfs_server *server,
701   - struct nfs4_sequence_args *args,
702   - struct nfs4_sequence_res *res,
703   - struct rpc_task *task)
  700 +static int nfs4_setup_sequence(const struct nfs_server *server,
  701 + struct nfs4_sequence_args *args,
  702 + struct nfs4_sequence_res *res,
  703 + struct rpc_task *task)
704 704 {
705 705 struct nfs4_session *session = nfs4_get_session(server);
706 706 int ret = 0;
... ... @@ -783,6 +783,14 @@
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 795 static int nfs4_sequence_done(struct rpc_task *task,
788 796 struct nfs4_sequence_res *res)