Commit efc6f4aa authored by Anna Schumaker's avatar Anna Schumaker
Browse files

NFS: Move nfs4_get_session() into nfs4_session.h 



This puts session related functions together in the same space.  I only
keep one version of this function, since this variable will always be
NULL when using NFS v4.0.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 6f6e3c09

fs/nfs/nfs42proc.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "nfs42.h"

#include "iostat.h"

#include "pnfs.h"

#include "nfs4session.h"

#include "internal.h"



#define NFSDBG_FACILITY NFSDBG_PROC

fs/nfs/nfs4_fs.h

+0 −10
Original line number Diff line number Diff line
@@ -273,11 +273,6 @@ extern int nfs4_set_rw_stateid(nfs4_stateid *stateid, 
		fmode_t fmode);



#if defined(CONFIG_NFS_V4_1)

static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *server)

{

	return server->nfs_client->cl_session;

}



extern int nfs41_setup_sequence(struct nfs4_session *session,

		struct nfs4_sequence_args *args, struct nfs4_sequence_res *res,

		struct rpc_task *task);
@@ -357,11 +352,6 @@ nfs4_state_protect_write(struct nfs_client *clp, struct rpc_clnt **clntp, 
		hdr->args.stable = NFS_FILE_SYNC;

}

#else /* CONFIG_NFS_v4_1 */

static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *server)

{

	return NULL;

}



static inline bool

is_ds_only_client(struct nfs_client *clp)

{

fs/nfs/nfs4session.h

+5 −0
Original line number Diff line number Diff line
@@ -103,6 +103,11 @@ static inline bool nfs4_test_locked_slot(const struct nfs4_slot_table *tbl, 
	return !!test_bit(slotid, tbl->used_slots);

}



static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *server)

{

	return server->nfs_client->cl_session;

}



#if defined(CONFIG_NFS_V4_1)

extern void nfs41_set_target_slotid(struct nfs4_slot_table *tbl,

		u32 target_highest_slotid);