From fe9a691755984ae0ab9fad777bec41c725681ca2 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 25 Jun 2006 02:41:27 -0700 Subject: [PATCH] --- yaml --- r: 30131 b: refs/heads/master c: 6ab86aa13045e7f6742af0b3c3c45f952f9fbb8d h: refs/heads/master i: 30129: de5bbb5f270e21b7ecb688523c74f09185fcc624 30127: 38ff5db7641e52f36c8dbb62b6b40e0cda16812b v: v3 --- [refs] | 2 +- trunk/fs/nfs/super.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8b2582614795..046938e96615 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d75d54147db9db5194040bd1c5022df6ba36ee48 +refs/heads/master: 6ab86aa13045e7f6742af0b3c3c45f952f9fbb8d diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index b977748553d3..e8a9bee74d9d 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -187,6 +187,7 @@ static struct super_operations nfs4_sops = { }; #endif +#ifdef CONFIG_NFS_V4 static const int nfs_set_port_min = 0; static const int nfs_set_port_max = 65535; @@ -202,7 +203,9 @@ static int param_set_port(const char *val, struct kernel_param *kp) module_param_call(callback_tcpport, param_set_port, param_get_int, &nfs_callback_set_tcpport, 0644); +#endif +#ifdef CONFIG_NFS_V4 static int param_set_idmap_timeout(const char *val, struct kernel_param *kp) { char *endp; @@ -216,6 +219,7 @@ static int param_set_idmap_timeout(const char *val, struct kernel_param *kp) module_param_call(idmap_cache_timeout, param_set_idmap_timeout, param_get_int, &nfs_idmap_cache_timeout, 0644); +#endif /* * Register the NFS filesystems