diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/9p/vfs_dir.c | 1 | ||||
| -rw-r--r-- | fs/nfsctl.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c index ae6d032b9b59..cd5eeb032d64 100644 --- a/fs/9p/vfs_dir.c +++ b/fs/9p/vfs_dir.c | |||
| @@ -202,7 +202,6 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) | |||
| 202 | filp->private_data = NULL; | 202 | filp->private_data = NULL; |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | d_drop(filp->f_dentry); | ||
| 206 | return 0; | 205 | return 0; |
| 207 | } | 206 | } |
| 208 | 207 | ||
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; |
