Commit 76e697ba authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Move slot table and session struct definitions to nfs4session.h 



Clean up. Gather NFSv4.1 slot definitions in fs/nfs/nfs4session.h.

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

fs/nfs/blocklayout/blocklayout.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/pagevec.h>



#include "../pnfs.h"

#include "../nfs4session.h"

#include "../internal.h"

#include "blocklayout.h"

fs/nfs/callback_xdr.c

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

#include "callback.h"

#include "internal.h"

#include "nfs4session.h"



#define CB_OP_TAGLEN_MAXSZ	(512)

#define CB_OP_HDR_RES_MAXSZ	(2 + CB_OP_TAGLEN_MAXSZ)

fs/nfs/internal.h

+0 −21
Original line number Diff line number Diff line
@@ -18,27 +18,6 @@ struct nfs_string; 
 */

#define NFS_MAX_READAHEAD	(RPC_DEF_SLOT_TABLE - 1)



/*

 * Determine if sessions are in use.

 */

static inline int nfs4_has_session(const struct nfs_client *clp)

{

#ifdef CONFIG_NFS_V4_1

	if (clp->cl_session)

		return 1;

#endif /* CONFIG_NFS_V4_1 */

	return 0;

}



static inline int nfs4_has_persistent_session(const struct nfs_client *clp)

{

#ifdef CONFIG_NFS_V4_1

	if (nfs4_has_session(clp))

		return (clp->cl_session->flags & SESSION4_PERSIST);

#endif /* CONFIG_NFS_V4_1 */

	return 0;

}



static inline void nfs_attr_check_mountpoint(struct super_block *parent, struct nfs_fattr *fattr)

{

	if (!nfs_fsid_equal(&NFS_SB(parent)->fsid, &fattr->fsid))

fs/nfs/nfs4_fs.h

+0 −12
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@ enum nfs4_client_state { 
	NFS4CLNT_BIND_CONN_TO_SESSION,

};



enum nfs4_session_state {

	NFS4_SESSION_INITING,

	NFS4_SESSION_DRAINING,

};



#define NFS4_RENEW_TIMEOUT		0x01

#define NFS4_RENEW_DELEGATION_CB	0x02
@@ -327,13 +322,6 @@ int nfs41_discover_server_trunking(struct nfs_client *clp, 
extern void nfs4_schedule_session_recovery(struct nfs4_session *, int);

extern void nfs41_server_notify_target_slotid_update(struct nfs_client *clp);



extern void nfs4_session_drain_complete(struct nfs4_session *session,

		struct nfs4_slot_table *tbl);



static inline bool nfs4_session_draining(struct nfs4_session *session)

{

	return !!test_bit(NFS4_SESSION_DRAINING, &session->session_state);

}

#else

static inline void nfs4_schedule_session_recovery(struct nfs4_session *session, int err)

{

fs/nfs/nfs4filelayout.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


#include <linux/sunrpc/metrics.h>



#include "nfs4session.h"

#include "internal.h"

#include "delegation.h"

#include "nfs4filelayout.h"