diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-20 04:48:50 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-20 04:48:50 -0500 |
commit | 29b2548bf53ffb810394a2110161ef49f8e4780f (patch) | |
tree | af0233def65a854dc95e5faca9645b30e88d45aa /fs/nfsctl.c | |
parent | c39f5ebe0a542caab30c88e60623709c7bc6fe30 (diff) | |
parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) |
Merge branch 'master'
Diffstat (limited to 'fs/nfsctl.c')
-rw-r--r-- | fs/nfsctl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsctl.c b/fs/nfsctl.c index 0d4cf9486068..1c72c7f85ddc 100644 --- a/fs/nfsctl.c +++ b/fs/nfsctl.c | |||
@@ -98,10 +98,8 @@ asmlinkage sys_nfsservctl(int cmd, struct nfsctl_arg __user *arg, void __user *r | |||
98 | if (copy_from_user(&version, &arg->ca_version, sizeof(int))) | 98 | if (copy_from_user(&version, &arg->ca_version, sizeof(int))) |
99 | return -EFAULT; | 99 | return -EFAULT; |
100 | 100 | ||
101 | if (version != NFSCTL_VERSION) { | 101 | if (version != NFSCTL_VERSION) |
102 | printk(KERN_WARNING "nfsd: incompatible version in syscall.\n"); | ||
103 | return -EINVAL; | 102 | return -EINVAL; |
104 | } | ||
105 | 103 | ||
106 | if (cmd < 0 || cmd >= sizeof(map)/sizeof(map[0]) || !map[cmd].name) | 104 | if (cmd < 0 || cmd >= sizeof(map)/sizeof(map[0]) || !map[cmd].name) |
107 | return -EINVAL; | 105 | return -EINVAL; |