Merge branch 'master' into upstream-fixes

[linux-2.6] / fs / nfsd / vfs.c

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 137565a136d705a3eda61c47296359c336bbcbad..1141bd29e4e3ee3b6f3b9711ace4d7323e42bd5d 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -447,13 +447,11 @@ nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
        } else if (error < 0)
                goto out_nfserr;
 
-       if (pacl) {
-               error = set_nfsv4_acl_one(dentry, pacl, POSIX_ACL_XATTR_ACCESS);
-               if (error < 0)
-                       goto out_nfserr;
-       }
+       error = set_nfsv4_acl_one(dentry, pacl, POSIX_ACL_XATTR_ACCESS);
+       if (error < 0)
+               goto out_nfserr;
 
-       if (dpacl) {
+       if (S_ISDIR(inode->i_mode)) {
                error = set_nfsv4_acl_one(dentry, dpacl, POSIX_ACL_XATTR_DEFAULT);
                if (error < 0)
                        goto out_nfserr;