Commit 1b146fcf authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust
Browse files

pnfs: Move nfs4_opendata into nfs4_fs.h 



It will be needed now by the pnfs code.

Signed-off-by: default avatarFred Isaman <fred.isaman@gmail.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 56f487f8

fs/nfs/nfs4_fs.h

+25 −0
Original line number Diff line number Diff line
@@ -212,6 +212,31 @@ struct nfs4_state_recovery_ops { 
		struct rpc_cred *);

};



struct nfs4_opendata {

	struct kref kref;

	struct nfs_openargs o_arg;

	struct nfs_openres o_res;

	struct nfs_open_confirmargs c_arg;

	struct nfs_open_confirmres c_res;

	struct nfs4_string owner_name;

	struct nfs4_string group_name;

	struct nfs4_label *a_label;

	struct nfs_fattr f_attr;

	struct nfs4_label *f_label;

	struct dentry *dir;

	struct dentry *dentry;

	struct nfs4_state_owner *owner;

	struct nfs4_state *state;

	struct iattr attrs;

	struct nfs4_layoutget *lgp;

	unsigned long timestamp;

	bool rpc_done;

	bool file_created;

	bool is_recover;

	bool cancelled;

	int rpc_status;

};



struct nfs4_add_xprt_data {

	struct nfs_client	*clp;

	struct rpc_cred		*cred;

fs/nfs/nfs4proc.c

+0 −25
Original line number Diff line number Diff line
@@ -1064,31 +1064,6 @@ static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo, 
	spin_unlock(&dir->i_lock);

}



struct nfs4_opendata {

	struct kref kref;

	struct nfs_openargs o_arg;

	struct nfs_openres o_res;

	struct nfs_open_confirmargs c_arg;

	struct nfs_open_confirmres c_res;

	struct nfs4_string owner_name;

	struct nfs4_string group_name;

	struct nfs4_label *a_label;

	struct nfs_fattr f_attr;

	struct nfs4_label *f_label;

	struct dentry *dir;

	struct dentry *dentry;

	struct nfs4_state_owner *owner;

	struct nfs4_state *state;

	struct iattr attrs;

	struct nfs4_layoutget *lgp;

	unsigned long timestamp;

	bool rpc_done;

	bool file_created;

	bool is_recover;

	bool cancelled;

	int rpc_status;

};



struct nfs4_open_createattrs {

	struct nfs4_label *label;

	struct iattr *sattr;

fs/nfs/pnfs.c

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

#include "delegation.h"

#include "nfs42.h"

#include "nfs4_fs.h"



#define NFSDBG_FACILITY		NFSDBG_PNFS

#define PNFS_LAYOUTGET_RETRY_TIMEOUT (120*HZ)