diff options
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r-- | fs/nfsd/vfs.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index d1c5f787b365..6e50aaa56ca2 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -764,7 +764,6 @@ static inline int nfsd_dosync(struct file *filp, struct dentry *dp, | |||
764 | 764 | ||
765 | return err; | 765 | return err; |
766 | } | 766 | } |
767 | |||
768 | 767 | ||
769 | static int | 768 | static int |
770 | nfsd_sync(struct file *filp) | 769 | nfsd_sync(struct file *filp) |
@@ -1211,7 +1210,7 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
1211 | dirp = dentry->d_inode; | 1210 | dirp = dentry->d_inode; |
1212 | 1211 | ||
1213 | err = nfserr_notdir; | 1212 | err = nfserr_notdir; |
1214 | if(!dirp->i_op || !dirp->i_op->lookup) | 1213 | if (!dirp->i_op->lookup) |
1215 | goto out; | 1214 | goto out; |
1216 | /* | 1215 | /* |
1217 | * Check whether the response file handle has been verified yet. | 1216 | * Check whether the response file handle has been verified yet. |
@@ -1347,7 +1346,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
1347 | /* Get all the sanity checks out of the way before | 1346 | /* Get all the sanity checks out of the way before |
1348 | * we lock the parent. */ | 1347 | * we lock the parent. */ |
1349 | err = nfserr_notdir; | 1348 | err = nfserr_notdir; |
1350 | if(!dirp->i_op || !dirp->i_op->lookup) | 1349 | if (!dirp->i_op->lookup) |
1351 | goto out; | 1350 | goto out; |
1352 | fh_lock_nested(fhp, I_MUTEX_PARENT); | 1351 | fh_lock_nested(fhp, I_MUTEX_PARENT); |
1353 | 1352 | ||
@@ -1482,7 +1481,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) | |||
1482 | inode = dentry->d_inode; | 1481 | inode = dentry->d_inode; |
1483 | 1482 | ||
1484 | err = nfserr_inval; | 1483 | err = nfserr_inval; |
1485 | if (!inode->i_op || !inode->i_op->readlink) | 1484 | if (!inode->i_op->readlink) |
1486 | goto out; | 1485 | goto out; |
1487 | 1486 | ||
1488 | touch_atime(fhp->fh_export->ex_path.mnt, dentry); | 1487 | touch_atime(fhp->fh_export->ex_path.mnt, dentry); |
@@ -2162,7 +2161,7 @@ nfsd_set_posix_acl(struct svc_fh *fhp, int type, struct posix_acl *acl) | |||
2162 | size_t size; | 2161 | size_t size; |
2163 | int error; | 2162 | int error; |
2164 | 2163 | ||
2165 | if (!IS_POSIXACL(inode) || !inode->i_op || | 2164 | if (!IS_POSIXACL(inode) || |
2166 | !inode->i_op->setxattr || !inode->i_op->removexattr) | 2165 | !inode->i_op->setxattr || !inode->i_op->removexattr) |
2167 | return -EOPNOTSUPP; | 2166 | return -EOPNOTSUPP; |
2168 | switch(type) { | 2167 | switch(type) { |