summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfssvc.c
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2014-06-10 18:08:19 +0800
committerJ. Bruce Fields <bfields@redhat.com>2014-06-23 11:31:36 -0400
commit3c7aa15d2073d81e56e8ba8771a4ab6f23be7ae2 (patch)
treef76a11c503dd24636dbd36dfb9a58aa3d76ad54e /fs/nfsd/nfssvc.c
parenta497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff)
downloadop-kernel-dev-3c7aa15d2073d81e56e8ba8771a4ab6f23be7ae2.zip
op-kernel-dev-3c7aa15d2073d81e56e8ba8771a4ab6f23be7ae2.tar.gz
NFSD: Using min/max/min_t/max_t for calculate
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfssvc.c')
-rw-r--r--fs/nfsd/nfssvc.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 1879e43..2094741 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -469,8 +469,7 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
/* enforce a global maximum number of threads */
tot = 0;
for (i = 0; i < n; i++) {
- if (nthreads[i] > NFSD_MAXSERVS)
- nthreads[i] = NFSD_MAXSERVS;
+ nthreads[i] = min(nthreads[i], NFSD_MAXSERVS);
tot += nthreads[i];
}
if (tot > NFSD_MAXSERVS) {
@@ -519,11 +518,11 @@ nfsd_svc(int nrservs, struct net *net)
mutex_lock(&nfsd_mutex);
dprintk("nfsd: creating service\n");
- if (nrservs <= 0)
- nrservs = 0;
- if (nrservs > NFSD_MAXSERVS)
- nrservs = NFSD_MAXSERVS;
+
+ nrservs = max(nrservs, 0);
+ nrservs = min(nrservs, NFSD_MAXSERVS);
error = 0;
+
if (nrservs == 0 && nn->nfsd_serv == NULL)
goto out;
OpenPOWER on IntegriCloud