pnfs: Move nfs4_opendata into nfs4_fs.h

It will be needed now by the pnfs code.

Signed-off-by: Fred Isaman <fred.isaman@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 06a41aa2fdb2fb0af653386a92302099b51772b0..137e18abb7e792660be11acf7b114213f71cd9a1 100644 (file)
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -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;

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index b3f200208295eb1668f5b7eaaa19378e26948ec3..c7f982cdcbdd3caac7a066a7e74509eee7c5f561 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -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;

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 363420d0f3a0b67d024e601b67176c6262701f70..11148414b9b63f6f0401676253c6d7e25880ad1b 100644 (file)
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -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)