Return-Path: Received: from daytona.panasas.com ([67.152.220.89]:22823 "EHLO daytona.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752537Ab1FMUys (ORCPT ); Mon, 13 Jun 2011 16:54:48 -0400 Message-ID: <4DF67918.6010202@panasas.com> Date: Mon, 13 Jun 2011 16:54:48 -0400 From: Boaz Harrosh To: Trond Myklebust CC: Benny Halevy , NFS list Subject: [PATCH 1/2] nfs_xdr: Move nfs4_string definition out of #ifdef CONFIG_NFS_V4 References: <4DF678C5.1080001@panasas.com> In-Reply-To: <4DF678C5.1080001@panasas.com> Content-Type: text/plain; charset=UTF-8 Sender: linux-nfs-owner@vger.kernel.org List-ID: MIME-Version: 1.0 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 --- include/linux/nfs_xdr.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) 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; -- 1.7.3.4