diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /fs/nfs/sysctl.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'fs/nfs/sysctl.c')
| -rw-r--r-- | fs/nfs/sysctl.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c index 2fe3403c2409..3ea50ac64820 100644 --- a/fs/nfs/sysctl.c +++ b/fs/nfs/sysctl.c | |||
| @@ -18,11 +18,6 @@ | |||
| 18 | static const int nfs_set_port_min = 0; | 18 | static const int nfs_set_port_min = 0; |
| 19 | static const int nfs_set_port_max = 65535; | 19 | static const int nfs_set_port_max = 65535; |
| 20 | static struct ctl_table_header *nfs_callback_sysctl_table; | 20 | static struct ctl_table_header *nfs_callback_sysctl_table; |
| 21 | /* | ||
| 22 | * Something that isn't CTL_ANY, CTL_NONE or a value that may clash. | ||
| 23 | * Use the same values as fs/lockd/svc.c | ||
| 24 | */ | ||
| 25 | #define CTL_UNNUMBERED -2 | ||
| 26 | 21 | ||
| 27 | static ctl_table nfs_cb_sysctls[] = { | 22 | static ctl_table nfs_cb_sysctls[] = { |
| 28 | #ifdef CONFIG_NFS_V4 | 23 | #ifdef CONFIG_NFS_V4 |