From patchwork Tue Feb 15 08:38:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 567981 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1GId3qD024617 for ; Wed, 16 Feb 2011 18:39:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752230Ab1BPSjB (ORCPT ); Wed, 16 Feb 2011 13:39:01 -0500 Received: from mx2.netapp.com ([216.240.18.37]:26933 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751792Ab1BPSjB (ORCPT ); Wed, 16 Feb 2011 13:39:01 -0500 X-IronPort-AV: E=Sophos;i="4.60,480,1291622400"; d="scan'208";a="519309955" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 16 Feb 2011 10:38:59 -0800 Received: from fedora-3.dros.org (lenovo-6284dfc6.hq.netapp.com [10.58.50.68] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p1GIcv7p024776; Wed, 16 Feb 2011 10:38:59 -0800 (PST) From: andros@netapp.com To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH pNFS wave 3 Version 2 01/18] NFSv4: remove CONFIG_NFS_V4 from nfs_read_data Date: Tue, 15 Feb 2011 03:38:46 -0500 Message-Id: <1297759143-2045-2-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1297759143-2045-1-git-send-email-andros@netapp.com> References: <1297759143-2045-1-git-send-email-andros@netapp.com> 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]); Wed, 16 Feb 2011 18:39:03 +0000 (UTC) diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index b006857..51bfadb 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -1016,9 +1016,7 @@ struct nfs_read_data { unsigned int npages; /* Max length of pagevec */ struct nfs_readargs args; struct nfs_readres res; -#ifdef CONFIG_NFS_V4 unsigned long timestamp; /* For lease renewal */ -#endif struct page *page_array[NFS_PAGEVEC_SIZE]; };