X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fnfsctl.c;h=a5a18d4aca40a89661ac5dc219c5041e83ac75bb;hb=a43a8c39bbb493c9e93f6764b350de2e33e18e92;hp=0d4cf948606866f71d1807883da0afbf35968668;hpb=0a0fc0ddbe732779366ab6b1b879f62195e65967;p=linux-2.6

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);