diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /fs/nfs/sysctl.c | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'fs/nfs/sysctl.c')
| -rw-r--r-- | fs/nfs/sysctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c index 70e1fbbaaea..ad4d2e787b2 100644 --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c | |||
| @@ -15,8 +15,10 @@ | |||
| 15 | 15 | ||
| 16 | #include "callback.h" | 16 | #include "callback.h" |
| 17 | 17 | ||
| 18 | #ifdef CONFIG_NFS_V4 | ||
| 18 | static const int nfs_set_port_min = 0; | 19 | static const int nfs_set_port_min = 0; |
| 19 | static const int nfs_set_port_max = 65535; | 20 | static const int nfs_set_port_max = 65535; |
| 21 | #endif | ||
| 20 | static struct ctl_table_header *nfs_callback_sysctl_table; | 22 | static struct ctl_table_header *nfs_callback_sysctl_table; |
| 21 | 23 | ||
| 22 | static ctl_table nfs_cb_sysctls[] = { | 24 | static ctl_table nfs_cb_sysctls[] = { |