From patchwork Mon Jun 13 20:54:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 876322 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5DKrYEv016417 for ; Mon, 13 Jun 2011 20:54:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752543Ab1FMUyt (ORCPT ); Mon, 13 Jun 2011 16:54:49 -0400 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 Received: from [172.17.33.114] ([172.17.33.114]) by daytona.panasas.com with Microsoft SMTPSVC(6.0.3790.4675); 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 User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110307 Fedora/3.1.9-0.38.b3pre.fc13 Thunderbird/3.1.9 MIME-Version: 1.0 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> X-OriginalArrivalTime: 13 Jun 2011 20:54:48.0307 (UTC) FILETIME=[21DDF430:01CC2A0C] Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 13 Jun 2011 20:54:50 +0000 (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 Acked-by: Trond Myklebust --- 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;