Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a580e0a authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 2a3eb2b9

fs/nfs/nfs4_fs.h

+0 −11
Original line number Diff line number Diff line
@@ -247,9 +247,6 @@ static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *ser 
	return server->nfs_client->cl_session;

}



extern int nfs4_setup_sequence(const struct nfs_server *server,

		struct nfs4_sequence_args *args, struct nfs4_sequence_res *res,

		struct rpc_task *task);

extern int nfs41_setup_sequence(struct nfs4_session *session,

		struct nfs4_sequence_args *args, struct nfs4_sequence_res *res,

		struct rpc_task *task);
@@ -278,14 +275,6 @@ static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *ser 
	return NULL;

}



static inline int nfs4_setup_sequence(const struct nfs_server *server,

		struct nfs4_sequence_args *args, struct nfs4_sequence_res *res,

		struct rpc_task *task)

{

	rpc_call_start(task);

	return 0;

}



static inline bool

is_ds_only_client(struct nfs_client *clp)

{

fs/nfs/nfs4proc.c

+12 −4
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ out_sleep: 
}

EXPORT_SYMBOL_GPL(nfs41_setup_sequence);



int nfs4_setup_sequence(const struct nfs_server *server,

static int nfs4_setup_sequence(const struct nfs_server *server,

			       struct nfs4_sequence_args *args,

			       struct nfs4_sequence_res *res,

			       struct rpc_task *task)
@@ -783,6 +783,14 @@ static void nfs4_set_sequence_privileged(struct nfs4_sequence_args *args) 
{

}



static int nfs4_setup_sequence(const struct nfs_server *server,

			       struct nfs4_sequence_args *args,

			       struct nfs4_sequence_res *res,

			       struct rpc_task *task)

{

	rpc_call_start(task);

	return 0;

}



static int nfs4_sequence_done(struct rpc_task *task,

			       struct nfs4_sequence_res *res)