diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 06:42:12 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 06:42:12 -0400 |
| commit | b4ca761577535b2b4d153689ee97342797dfff05 (patch) | |
| tree | 29054d55508f1faa22ec32acf7c245751af03348 /fs/nfsd | |
| parent | 28f4197e5d4707311febeec8a0eb97cb5fd93c97 (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' into for-linus
Conflicts:
fs/pipe.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index bc3194ea01f5..508941c23af7 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c | |||
| @@ -998,7 +998,7 @@ static ssize_t __write_ports_addxprt(char *buf) | |||
| 998 | if (sscanf(buf, "%15s %4u", transport, &port) != 2) | 998 | if (sscanf(buf, "%15s %4u", transport, &port) != 2) |
| 999 | return -EINVAL; | 999 | return -EINVAL; |
| 1000 | 1000 | ||
| 1001 | if (port < 1 || port > USHORT_MAX) | 1001 | if (port < 1 || port > USHRT_MAX) |
| 1002 | return -EINVAL; | 1002 | return -EINVAL; |
| 1003 | 1003 | ||
| 1004 | err = nfsd_create_serv(); | 1004 | err = nfsd_create_serv(); |
| @@ -1040,7 +1040,7 @@ static ssize_t __write_ports_delxprt(char *buf) | |||
| 1040 | if (sscanf(&buf[1], "%15s %4u", transport, &port) != 2) | 1040 | if (sscanf(&buf[1], "%15s %4u", transport, &port) != 2) |
| 1041 | return -EINVAL; | 1041 | return -EINVAL; |
| 1042 | 1042 | ||
| 1043 | if (port < 1 || port > USHORT_MAX || nfsd_serv == NULL) | 1043 | if (port < 1 || port > USHRT_MAX || nfsd_serv == NULL) |
| 1044 | return -EINVAL; | 1044 | return -EINVAL; |
| 1045 | 1045 | ||
| 1046 | xprt = svc_find_xprt(nfsd_serv, transport, AF_UNSPEC, port); | 1046 | xprt = svc_find_xprt(nfsd_serv, transport, AF_UNSPEC, port); |