d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Abstract out setting of nfsdcnt and consistently use MAXNFSDCNT when the

Browse Source 
proposed value is too high and DEFNFSDCNT when proposed value is too low.

MFC after:	2 weeks
This commit is contained in:
Xin LI 2013-02-14 01:25:14 +00:00
parent f33fce4865
commit 2a0b6dc5c3
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
usr.sbin/nfsd/nfsd.c
View File

@ -119,6 +119,7 @@ static void usage(void);
static void open_stable(int *, int *);
static void copy_stable(int, int);
static void backup_stable(int);
static void set_nfsdcnt(int);
/*
* Nfs server daemon mostly just a user context for nfssvc()
@ -178,8 +179,7 @@ main(int argc, char **argv)
bindanyflag = 1;
break;
case 'n':
nfsdcnt_set = 1;
nfsdcnt = atoi(optarg);
set_nfsdcnt(atoi(optarg));
break;
case 'h':
bindhostc++;
@ -235,15 +235,8 @@ main(int argc, char **argv)
*/
if (argc > 1)
usage();
if (argc == 1) {
nfsdcnt_set = 1;
nfsdcnt = atoi(argv[0]);
if (nfsdcnt < 1 || nfsdcnt > MAXNFSDCNT) {
warnx("nfsd count %d; reset to %d", nfsdcnt,
DEFNFSDCNT);
nfsdcnt = DEFNFSDCNT;
}
}
if (argc == 1)
set_nfsdcnt(atoi(argv[0]));
/*
* Unless the "-o" option was specified, try and run "nfsd".
@ -429,16 +422,6 @@ main(int argc, char **argv)
}
if (!new_syscall) {
if (nfsdcnt < 1) {
warnx("nfsd count too low %d; reset to %d", nfsdcnt,
DEFNFSDCNT);
nfsdcnt = DEFNFSDCNT;
}
if (nfsdcnt > MAXNFSDCNT) {
warnx("nfsd count too high %d; reset to %d", nfsdcnt,
DEFNFSDCNT);
nfsdcnt = MAXNFSDCNT;
}
/* If we use UDP only, we start the last server below. */
srvcnt = tcpflag ? nfsdcnt : nfsdcnt - 1;
for (i = 0; i < srvcnt; i++) {
@ -890,6 +873,23 @@ setbindhost(struct addrinfo **ai, const char *bindhost, struct addrinfo hints)
return (0);
}
static void
set_nfsdcnt(int proposed)
{
if (proposed < 1) {
warnx("nfsd count too low %d; reset to %d", proposed,
DEFNFSDCNT);
nfsdcnt = DEFNFSDCNT;
} else if (proposed > MAXNFSDCNT) {
warnx("nfsd count too high %d; truncated to %d", proposed,
MAXNFSDCNT);
nfsdcnt = MAXNFSDCNT;
} else
nfsdcnt = proposed;
nfsdcnt_set = 1;
}
static void
usage(void)
{