From: Benny Halevy Subject: [PATCH 1/2] SQUASHEM: nfsd41: define NFSD_DRC_SIZE_SHIFT in set_max_drc Date: Mon, 6 Apr 2009 12:00:36 +0300 Message-ID: <1239008436-8073-1-git-send-email-bhalevy@panasas.com> References: <49D9C308.6020500@panasas.com> Cc: Alexander Beregalov , Stephen Rothwell , linux-next@vger.kernel.org, pnfs@linux-nfs.org, linux-nfs@vger.kernel.org, Benny Halevy To: " J. Bruce Fields" , Andy Adamson Return-path: Received: from gw-ca.panasas.com ([209.116.51.66]:5182 "EHLO laguna.int.panasas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751304AbZDFJAu (ORCPT ); Mon, 6 Apr 2009 05:00:50 -0400 In-Reply-To: <49D9C308.6020500@panasas.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: Fixes the following compiler error: fs/nfsd/nfssvc.c: In function 'set_max_drc': fs/nfsd/nfssvc.c:240: error: 'NFSD_DRC_SIZE_SHIFT' undeclared CONFIG_NFSD_V4 is not set Reported-by: Alexander Beregalov Signed-off-by: Benny Halevy --- fs/nfsd/nfssvc.c | 2 ++ include/linux/nfsd/nfsd.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index e9d5773..469c931 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -236,6 +236,8 @@ void nfsd_reset_versions(void) */ static void set_max_drc(void) { + /* The percent of nr_free_buffer_pages used by the V4.1 server DRC */ + #define NFSD_DRC_SIZE_SHIFT 7 nfsd_serv->sv_drc_max_pages = nr_free_buffer_pages() >> NFSD_DRC_SIZE_SHIFT; nfsd_serv->sv_drc_pages_used = 0; diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index 0ec4d14..2b49d67 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h @@ -333,9 +333,6 @@ extern struct timeval nfssvc_boot; #define NFSD_LEASE_TIME (nfs4_lease_time()) #define NFSD_LAUNDROMAT_MINTIMEOUT 10 /* seconds */ -/* The percent of nr_free_buffer_pages used by the V4.1 server DRC */ -#define NFSD_DRC_SIZE_SHIFT 7 - /* * The following attributes are currently not supported by the NFSv4 server: * ARCHIVE (deprecated anyway) -- 1.6.2.1