Commit 73e39aaa authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Cleanup move session slot management to fs/nfs/nfs4session.c 



NFSv4.1 session management is getting complex enough to deserve
a separate file.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 33021279

fs/nfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ nfsv4-y := nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o nfs4super.o nfs4file.o 
	  delegation.o idmap.o callback.o callback_xdr.o callback_proc.o \

	  nfs4namespace.o nfs4getroot.o nfs4client.o

nfsv4-$(CONFIG_SYSCTL)	+= nfs4sysctl.o

nfsv4-$(CONFIG_NFS_V4_1)	+= pnfs.o pnfs_dev.o

nfsv4-$(CONFIG_NFS_V4_1)	+= nfs4session.o pnfs.o pnfs_dev.o



obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o

nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o

fs/nfs/callback_proc.c

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

#include "internal.h"

#include "pnfs.h"

#include "nfs4session.h"



#ifdef NFS_DEBUG

#define NFSDBG_FACILITY NFSDBG_CALLBACK

fs/nfs/internal.h

+0 −2
Original line number Diff line number Diff line
@@ -276,8 +276,6 @@ extern const u32 nfs41_maxwrite_overhead; 
extern struct rpc_procinfo nfs4_procedures[];

#endif



extern int nfs4_init_ds_session(struct nfs_client *, unsigned long);



/* proc.c */

void nfs_close_context(struct nfs_open_context *ctx, int is_sync);

extern struct nfs_client *nfs_init_client(struct nfs_client *clp,

fs/nfs/nfs4_fs.h

+0 −11
Original line number Diff line number Diff line
@@ -249,19 +249,13 @@ extern int nfs4_setup_sequence(const struct nfs_server *server, 
extern int nfs41_setup_sequence(struct nfs4_session *session,

		struct nfs4_sequence_args *args, struct nfs4_sequence_res *res,

		struct rpc_task *task);

extern void nfs4_destroy_session(struct nfs4_session *session);

extern struct nfs4_session *nfs4_alloc_session(struct nfs_client *clp);

extern int nfs4_proc_create_session(struct nfs_client *, struct rpc_cred *);

extern int nfs4_proc_destroy_session(struct nfs4_session *, struct rpc_cred *);

extern int nfs4_init_session(struct nfs_server *server);

extern int nfs4_proc_get_lease_time(struct nfs_client *clp,

		struct nfs_fsinfo *fsinfo);

extern int nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data,

				  bool sync);



extern void nfs41_set_target_slotid(struct nfs4_slot_table *tbl,

		u32 target_highest_slotid);



static inline bool

is_ds_only_client(struct nfs_client *clp)

{
@@ -287,11 +281,6 @@ static inline int nfs4_setup_sequence(const struct nfs_server *server, 
	return 0;

}



static inline int nfs4_init_session(struct nfs_server *server)

{

	return 0;

}



static inline bool

is_ds_only_client(struct nfs_client *clp)

{

fs/nfs/nfs4client.c

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

#include "callback.h"

#include "delegation.h"

#include "nfs4session.h"

#include "pnfs.h"

#include "netns.h"