X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=fs%2Fnfsctl.c;h=c043136a82caa862d9b72d7196047765490064a0;hb=831441862956fffa17b9801db37e6ea1650b0f69;hp=0d4cf948606866f71d1807883da0afbf35968668;hpb=292dd876ee765c478b27c93cc51e93a558ed58bf;p=deliverable%2Flinux.git

diff --git a/fs/nfsctl.c b/fs/nfsctl.c
index 0d4cf9486068..c043136a82ca 100644
--- a/fs/nfsctl.c
+++ b/fs/nfsctl.c
@@ -4,7 +4,6 @@
  *	This should eventually move to userland.
  *
  */
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/file.h>
 #include <linux/fs.h>
@@ -98,12 +97,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);