From: Fred Isaman Subject: [PATCH 07/22] pnfs: remove PNFS_LAYOUTGET_ON_OPEN Date: Sat, 15 May 2010 21:22:58 -0400 Message-ID: <1273972993-15369-8-git-send-email-iisaman@netapp.com> References: <1273972993-15369-1-git-send-email-iisaman@netapp.com> <1273972993-15369-2-git-send-email-iisaman@netapp.com> <1273972993-15369-3-git-send-email-iisaman@netapp.com> <1273972993-15369-4-git-send-email-iisaman@netapp.com> <1273972993-15369-5-git-send-email-iisaman@netapp.com> <1273972993-15369-6-git-send-email-iisaman@netapp.com> <1273972993-15369-7-git-send-email-iisaman@netapp.com> To: linux-nfs@vger.kernel.org Return-path: Received: from mx2.netapp.com ([216.240.18.37]:47588 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754668Ab0ETKag (ORCPT ); Thu, 20 May 2010 06:30:36 -0400 Received: from localhost.localdomain (vpn2ntap-176975.hq.netapp.com [10.58.56.200]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id o4KAUQbv022655 for ; Thu, 20 May 2010 03:30:35 -0700 (PDT) In-Reply-To: <1273972993-15369-7-git-send-email-iisaman@netapp.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: It is not used anywhere. Signed-off-by: Fred Isaman --- fs/nfs/nfs4filelayout.c | 3 +-- include/linux/nfs4_pnfs.h | 14 -------------- 2 files changed, 1 insertions(+), 16 deletions(-) diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 3f31c32..c96dd0e 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -710,8 +710,7 @@ struct layoutdriver_io_operations filelayout_io_operations = { }; struct layoutdriver_policy_operations filelayout_policy_operations = { - .flags = PNFS_USE_RPC_CODE | - PNFS_LAYOUTGET_ON_OPEN, + .flags = PNFS_USE_RPC_CODE, .get_stripesize = filelayout_get_stripesize, .pg_test = filelayout_pg_test, }; diff --git a/include/linux/nfs4_pnfs.h b/include/linux/nfs4_pnfs.h index 4d47b48..0feb5b7 100644 --- a/include/linux/nfs4_pnfs.h +++ b/include/linux/nfs4_pnfs.h @@ -165,11 +165,6 @@ enum layoutdriver_policy_flags { /* Should the NFS req. gather algorithm cross stripe boundaries? */ PNFS_GATHER_ACROSS_STRIPES = 1 << 1, - /* Should the pNFS client issue a layoutget call in the - * same compound as the OPEN operation? - */ - PNFS_LAYOUTGET_ON_OPEN = 1 << 2, - /* Should the pNFS client commit and return the layout upon a setattr */ PNFS_LAYOUTRET_ON_SETATTR = 1 << 3, }; @@ -198,15 +193,6 @@ pnfs_ld_gather_across_stripes(struct pnfs_layoutdriver_type *ld) return ld->ld_policy_ops->flags & PNFS_GATHER_ACROSS_STRIPES; } -/* Should the pNFS client issue a layoutget call in the - * same compound as the OPEN operation? - */ -static inline int -pnfs_ld_layoutget_on_open(struct pnfs_layoutdriver_type *ld) -{ - return ld->ld_policy_ops->flags & PNFS_LAYOUTGET_ON_OPEN; -} - /* Should the pNFS client commit and return the layout upon a setattr */ static inline int -- 1.6.6.1