diff options
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r-- | fs/nfsd/vfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 5685c679dd93..368526582429 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -615,9 +615,9 @@ nfsd_access(struct svc_rqst *rqstp, struct svc_fh *fhp, u32 *access, u32 *suppor | |||
615 | export = fhp->fh_export; | 615 | export = fhp->fh_export; |
616 | dentry = fhp->fh_dentry; | 616 | dentry = fhp->fh_dentry; |
617 | 617 | ||
618 | if (S_ISREG(dentry->d_inode->i_mode)) | 618 | if (d_is_reg(dentry)) |
619 | map = nfs3_regaccess; | 619 | map = nfs3_regaccess; |
620 | else if (S_ISDIR(dentry->d_inode->i_mode)) | 620 | else if (d_is_dir(dentry)) |
621 | map = nfs3_diraccess; | 621 | map = nfs3_diraccess; |
622 | else | 622 | else |
623 | map = nfs3_anyaccess; | 623 | map = nfs3_anyaccess; |
@@ -1402,7 +1402,7 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp, | |||
1402 | 1402 | ||
1403 | switch (createmode) { | 1403 | switch (createmode) { |
1404 | case NFS3_CREATE_UNCHECKED: | 1404 | case NFS3_CREATE_UNCHECKED: |
1405 | if (! S_ISREG(dchild->d_inode->i_mode)) | 1405 | if (! d_is_reg(dchild)) |
1406 | goto out; | 1406 | goto out; |
1407 | else if (truncp) { | 1407 | else if (truncp) { |
1408 | /* in nfsv4, we need to treat this case a little | 1408 | /* in nfsv4, we need to treat this case a little |
@@ -1615,7 +1615,7 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp, | |||
1615 | if (err) | 1615 | if (err) |
1616 | goto out; | 1616 | goto out; |
1617 | err = nfserr_isdir; | 1617 | err = nfserr_isdir; |
1618 | if (S_ISDIR(tfhp->fh_dentry->d_inode->i_mode)) | 1618 | if (d_is_dir(tfhp->fh_dentry)) |
1619 | goto out; | 1619 | goto out; |
1620 | err = nfserr_perm; | 1620 | err = nfserr_perm; |
1621 | if (!len) | 1621 | if (!len) |