[XFS] Kill attr_capable checks as already done in xattr_permission.
No need for addition permission checks in the xattr handler, fs/xattr.c:xattr_permission() already does them, and in fact slightly more strict then what was in the attr_capable handlers. SGI-PV: 981809 SGI-Modid: xfs-linux-melb:xfs-kern:31164a Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Tim Shimmin <tes@sgi.com> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:

committed by
Niv Sardi

parent
d748c62367
commit
911ee3de3d
@@ -739,15 +739,11 @@ xfs_vn_setxattr(
|
||||
char *attr = (char *)name;
|
||||
attrnames_t *namesp;
|
||||
int xflags = 0;
|
||||
int error;
|
||||
|
||||
namesp = attr_lookup_namespace(attr, attr_namespaces, ATTR_NAMECOUNT);
|
||||
if (!namesp)
|
||||
return -EOPNOTSUPP;
|
||||
attr += namesp->attr_namelen;
|
||||
error = namesp->attr_capable(vp, NULL);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
/* Convert Linux syscall to XFS internal ATTR flags */
|
||||
if (flags & XATTR_CREATE)
|
||||
@@ -769,15 +765,11 @@ xfs_vn_getxattr(
|
||||
char *attr = (char *)name;
|
||||
attrnames_t *namesp;
|
||||
int xflags = 0;
|
||||
ssize_t error;
|
||||
|
||||
namesp = attr_lookup_namespace(attr, attr_namespaces, ATTR_NAMECOUNT);
|
||||
if (!namesp)
|
||||
return -EOPNOTSUPP;
|
||||
attr += namesp->attr_namelen;
|
||||
error = namesp->attr_capable(vp, NULL);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
/* Convert Linux syscall to XFS internal ATTR flags */
|
||||
if (!size) {
|
||||
@@ -817,15 +809,12 @@ xfs_vn_removexattr(
|
||||
char *attr = (char *)name;
|
||||
attrnames_t *namesp;
|
||||
int xflags = 0;
|
||||
int error;
|
||||
|
||||
namesp = attr_lookup_namespace(attr, attr_namespaces, ATTR_NAMECOUNT);
|
||||
if (!namesp)
|
||||
return -EOPNOTSUPP;
|
||||
attr += namesp->attr_namelen;
|
||||
error = namesp->attr_capable(vp, NULL);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
xflags |= namesp->attr_flag;
|
||||
return namesp->attr_remove(vp, attr, xflags);
|
||||
}
|
||||
|
Reference in New Issue
Block a user