From: J. Bruce Fields Date: Tue, 15 Jan 2008 21:43:19 +0000 (-0500) Subject: nfs4: allow nfsv4 acls on non-regular-files X-Git-Tag: v2.6.25-rc1~1146^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3d1c550874bcaf0d9b7fb66f601caed109074f4b;p=linux-2.6-omap-h63xx.git nfs4: allow nfsv4 acls on non-regular-files The rfc doesn't give any reason it shouldn't be possible to set an attribute on a non-regular file. And if the server supports it, then it shouldn't be up to us to prevent it. Thanks to Erez for the report and Trond for further analysis. Signed-off-by: J. Bruce Fields Tested-by: Erez Zadok Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index b3d4e8e5696..89efbcd6fd5 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3617,10 +3617,6 @@ int nfs4_setxattr(struct dentry *dentry, const char *key, const void *buf, if (strcmp(key, XATTR_NAME_NFSV4_ACL) != 0) return -EOPNOTSUPP; - if (!S_ISREG(inode->i_mode) && - (!S_ISDIR(inode->i_mode) || inode->i_mode & S_ISVTX)) - return -EPERM; - return nfs4_proc_set_acl(inode, buf, buflen); }