X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fnfsctl.c;h=a5a18d4aca40a89661ac5dc219c5041e83ac75bb;hb=b7542f8c7eb40efb967a558c5be90fe5f939c3ef;hp=0d4cf948606866f71d1807883da0afbf35968668;hpb=a6df590dd8b7644c8e298e3b13442bcd6ceeb739;p=powerpc.git diff --git a/fs/nfsctl.c b/fs/nfsctl.c index 0d4cf94860..a5a18d4aca 100644 --- a/fs/nfsctl.c +++ b/fs/nfsctl.c @@ -98,12 +98,10 @@ 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) + if (cmd < 0 || cmd >= ARRAY_SIZE(map) || !map[cmd].name) return -EINVAL; file = do_open(map[cmd].name, map[cmd].rsize ? O_RDWR : O_WRONLY);