From d4db2df989225c8cbe8542e70cde352e45f225f1 Mon Sep 17 00:00:00 2001 From: Benny Halevy Date: Mon, 6 Apr 2009 12:00:36 +0300 Subject: [PATCH] --- yaml --- r: 142216 b: refs/heads/master c: f0ad670d7061efad138df19aefe569263c4ea37b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfssvc.c | 2 ++ trunk/include/linux/nfsd/nfsd.h | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ddb57dc94a4e..ffeacfb8a024 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ef1728898f0285c13aa6901f412b52835e23578 +refs/heads/master: f0ad670d7061efad138df19aefe569263c4ea37b diff --git a/trunk/fs/nfsd/nfssvc.c b/trunk/fs/nfsd/nfssvc.c index e9d57734a348..469c931cca95 100644 --- a/trunk/fs/nfsd/nfssvc.c +++ b/trunk/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/trunk/include/linux/nfsd/nfsd.h b/trunk/include/linux/nfsd/nfsd.h index 0ec4d142c503..2b49d676d0c9 100644 --- a/trunk/include/linux/nfsd/nfsd.h +++ b/trunk/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)