aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2009-04-06 05:00:36 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-04-06 12:17:53 -0400
commitf0ad670d7061efad138df19aefe569263c4ea37b (patch)
treed68d7a2deb01814aa5c8e1d32b867010a3284bd2
parent3ef1728898f0285c13aa6901f412b52835e23578 (diff)
nfsd41: define NFSD_DRC_SIZE_SHIFT in set_max_drc
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 <a.beregalov@gmail.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--fs/nfsd/nfssvc.c2
-rw-r--r--include/linux/nfsd/nfsd.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index e9d57734a348..469c931cca95 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -236,6 +236,8 @@ void nfsd_reset_versions(void)
236 */ 236 */
237static void set_max_drc(void) 237static void set_max_drc(void)
238{ 238{
239 /* The percent of nr_free_buffer_pages used by the V4.1 server DRC */
240 #define NFSD_DRC_SIZE_SHIFT 7
239 nfsd_serv->sv_drc_max_pages = nr_free_buffer_pages() 241 nfsd_serv->sv_drc_max_pages = nr_free_buffer_pages()
240 >> NFSD_DRC_SIZE_SHIFT; 242 >> NFSD_DRC_SIZE_SHIFT;
241 nfsd_serv->sv_drc_pages_used = 0; 243 nfsd_serv->sv_drc_pages_used = 0;
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index 0ec4d142c503..2b49d676d0c9 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -333,9 +333,6 @@ extern struct timeval nfssvc_boot;
333#define NFSD_LEASE_TIME (nfs4_lease_time()) 333#define NFSD_LEASE_TIME (nfs4_lease_time())
334#define NFSD_LAUNDROMAT_MINTIMEOUT 10 /* seconds */ 334#define NFSD_LAUNDROMAT_MINTIMEOUT 10 /* seconds */
335 335
336/* The percent of nr_free_buffer_pages used by the V4.1 server DRC */
337#define NFSD_DRC_SIZE_SHIFT 7
338
339/* 336/*
340 * The following attributes are currently not supported by the NFSv4 server: 337 * The following attributes are currently not supported by the NFSv4 server:
341 * ARCHIVE (deprecated anyway) 338 * ARCHIVE (deprecated anyway)