summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoaz Harrosh <bharrosh@panasas.com>2011-05-29 10:57:47 +0300
committerBoaz Harrosh <bharrosh@panasas.com>2011-08-04 12:35:08 -0700
commit655b16128482fd12808f77a6799eea5419c93709 (patch)
tree833ca3eb906cc3ab872b7925efa8ffb6a02a22bb
parent02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff)
downloadop-kernel-dev-655b16128482fd12808f77a6799eea5419c93709.zip
op-kernel-dev-655b16128482fd12808f77a6799eea5419c93709.tar.gz
nfs_xdr: Move nfs4_string definition out of #ifdef CONFIG_NFS_V4
exofs file system wants to use pnfs_osd_xdr.h file instead of redefining pnfs-objects types in it's private "pnfs.h" headr. Before we do the switch we must make sure pnfs_osd_xdr.h is compilable also under NFS versions smaller than 4.1. Since now it is needed regardless of version, by the exofs code. nfs4_string is not the only nfs4 type out in the global scope. Ack-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
-rw-r--r--include/linux/nfs_xdr.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 00848d8..d9f5e8d 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -759,6 +759,11 @@ struct nfs3_getaclres {
struct posix_acl * acl_default;
};
+struct nfs4_string {
+ unsigned int len;
+ char *data;
+};
+
#ifdef CONFIG_NFS_V4
typedef u64 clientid4;
@@ -949,11 +954,6 @@ struct nfs4_server_caps_res {
struct nfs4_sequence_res seq_res;
};
-struct nfs4_string {
- unsigned int len;
- char *data;
-};
-
#define NFS4_PATHNAME_MAXCOMPONENTS 512
struct nfs4_pathname {
unsigned int ncomponents;
OpenPOWER on IntegriCloud