xfs: Remove all strlen in all xfs_attr_* functions for attr names.
This helps to pre-simplify the extra handling of the null terminator in delayed operations which use memcpy rather than strlen. Later when we introduce parent pointers, attribute names will become binary, so strlen will not work at all. Removing uses of strlen now will help reduce complexities later Signed-off-by: Allison Collins <allison.henderson@oracle.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:

committed by
Darrick J. Wong

parent
780d290577
commit
d29f781c32
@@ -24,6 +24,7 @@ xfs_xattr_get(const struct xattr_handler *handler, struct dentry *unused,
|
||||
int xflags = handler->flags;
|
||||
struct xfs_inode *ip = XFS_I(inode);
|
||||
int error, asize = size;
|
||||
size_t namelen = strlen(name);
|
||||
|
||||
/* Convert Linux syscall to XFS internal ATTR flags */
|
||||
if (!size) {
|
||||
@@ -31,7 +32,8 @@ xfs_xattr_get(const struct xattr_handler *handler, struct dentry *unused,
|
||||
value = NULL;
|
||||
}
|
||||
|
||||
error = xfs_attr_get(ip, name, (unsigned char **)&value, &asize, xflags);
|
||||
error = xfs_attr_get(ip, name, namelen, (unsigned char **)&value,
|
||||
&asize, xflags);
|
||||
if (error)
|
||||
return error;
|
||||
return asize;
|
||||
@@ -67,6 +69,7 @@ xfs_xattr_set(const struct xattr_handler *handler, struct dentry *unused,
|
||||
int xflags = handler->flags;
|
||||
struct xfs_inode *ip = XFS_I(inode);
|
||||
int error;
|
||||
size_t namelen = strlen(name);
|
||||
|
||||
/* Convert Linux syscall to XFS internal ATTR flags */
|
||||
if (flags & XATTR_CREATE)
|
||||
@@ -75,10 +78,10 @@ xfs_xattr_set(const struct xattr_handler *handler, struct dentry *unused,
|
||||
xflags |= ATTR_REPLACE;
|
||||
|
||||
if (value)
|
||||
error = xfs_attr_set(ip, (unsigned char *)name,
|
||||
(void *)value, size, xflags);
|
||||
error = xfs_attr_set(ip, name, namelen, (void *)value, size,
|
||||
xflags);
|
||||
else
|
||||
error = xfs_attr_remove(ip, (unsigned char *)name, xflags);
|
||||
error = xfs_attr_remove(ip, name, namelen, xflags);
|
||||
if (!error)
|
||||
xfs_forget_acl(inode, name, xflags);
|
||||
|
||||
|
Reference in New Issue
Block a user