diff mbox

[1/2] nfs_xdr: Move nfs4_string definition out of #ifdef CONFIG_NFS_V4

Message ID 4DF67918.6010202@panasas.com (mailing list archive)
State New, archived
Headers show

Commit Message

Boaz Harrosh June 13, 2011, 8:54 p.m. UTC
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.

Only miss-out is nfs4_string move it to global scope.

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
 include/linux/nfs_xdr.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Comments

Trond Myklebust June 14, 2011, 6:45 p.m. UTC | #1
On Mon, 2011-06-13 at 16:54 -0400, Boaz Harrosh wrote: 
> 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.
> 
> Only miss-out is nfs4_string move it to global scope.
> 
> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>

Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
diff mbox

Patch

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 0a21844..7372921 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -774,6 +774,11 @@  struct nfs3_getaclres {
 	struct posix_acl *	acl_default;
 };
 
+struct nfs4_string {
+	unsigned int len;
+	char *data;
+};
+
 #ifdef CONFIG_NFS_V4
 
 typedef u64 clientid4;
@@ -964,11 +969,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;