diff --git a/[refs] b/[refs] index f12ac4be84a1..7b0dbe7621aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b40dc780ed996162f3af8712eb03beb24dcdbef +refs/heads/master: 85c6932ef0c7a82c309f8728ddf29768001d794e diff --git a/trunk/fs/nfsctl.c b/trunk/fs/nfsctl.c index 0d4cf9486068..1c72c7f85ddc 100644 --- a/trunk/fs/nfsctl.c +++ b/trunk/fs/nfsctl.c @@ -98,10 +98,8 @@ asmlinkage sys_nfsservctl(int cmd, struct nfsctl_arg __user *arg, void __user *r if (copy_from_user(&version, &arg->ca_version, sizeof(int))) return -EFAULT; - if (version != NFSCTL_VERSION) { - printk(KERN_WARNING "nfsd: incompatible version in syscall.\n"); + if (version != NFSCTL_VERSION) return -EINVAL; - } if (cmd < 0 || cmd >= sizeof(map)/sizeof(map[0]) || !map[cmd].name) return -EINVAL;