On 11/7/19 6:13 PM, Darrick J. Wong wrote:
Ok, I think in one of the previous reviews we decided on an explicit struct initialization. It works in most cases, but just couldn't be applied here because of the case handling. I'm not sure how opinionated people really are about though?On Wed, Nov 06, 2019 at 06:27:46PM -0700, Allison Collins wrote:This patch replaces the attribute name and length parameters with a single struct xfs_name parameter. This helps to clean up the numbers of parameters being passed around and pre-simplifies the code some. Signed-off-by: Allison Collins <allison.henderson@xxxxxxxxxx> --- fs/xfs/libxfs/xfs_attr.c | 22 +++++++++------------- fs/xfs/libxfs/xfs_attr.h | 12 +++++------- fs/xfs/xfs_acl.c | 27 +++++++++++++-------------- fs/xfs/xfs_ioctl.c | 25 +++++++++++++++---------- fs/xfs/xfs_iops.c | 9 ++++++--- fs/xfs/xfs_xattr.c | 25 +++++++++++++++---------- 6 files changed, 63 insertions(+), 57 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 7589cb7..5a9624a 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -61,8 +61,7 @@ STATIC int xfs_attr_args_init( struct xfs_da_args *args, struct xfs_inode *dp, - const unsigned char *name, - size_t namelen, + struct xfs_name *name, int flags) {@@ -74,8 +73,8 @@ xfs_attr_args_init(args->whichfork = XFS_ATTR_FORK; args->dp = dp; args->flags = flags; - args->name = name; - args->namelen = namelen; + args->name = name->name; + args->namelen = name->len; if (args->namelen >= MAXNAMELEN) return -EFAULT; /* match IRIX behaviour */@@ -139,8 +138,7 @@ xfs_attr_get_ilocked(int xfs_attr_get( struct xfs_inode *ip, - const unsigned char *name, - size_t namelen, + struct xfs_name *name, unsigned char **value, int *valuelenp, int flags) @@ -156,7 +154,7 @@ xfs_attr_get( if (XFS_FORCED_SHUTDOWN(ip->i_mount)) return -EIO;- error = xfs_attr_args_init(&args, ip, name, namelen, flags);+ error = xfs_attr_args_init(&args, ip, name, flags); if (error) return error;@@ -339,8 +337,7 @@ xfs_attr_remove_args(int xfs_attr_set( struct xfs_inode *dp, - const unsigned char *name, - size_t namelen, + struct xfs_name *name, unsigned char *value, int valuelen, int flags) @@ -356,7 +353,7 @@ xfs_attr_set( if (XFS_FORCED_SHUTDOWN(dp->i_mount)) return -EIO;- error = xfs_attr_args_init(&args, dp, name, namelen, flags);+ error = xfs_attr_args_init(&args, dp, name, flags); if (error) return error;@@ -444,8 +441,7 @@ xfs_attr_set(int xfs_attr_remove( struct xfs_inode *dp, - const unsigned char *name, - size_t namelen, + struct xfs_name *name, int flags) { struct xfs_mount *mp = dp->i_mount; @@ -457,7 +453,7 @@ xfs_attr_remove( if (XFS_FORCED_SHUTDOWN(dp->i_mount)) return -EIO;- error = xfs_attr_args_init(&args, dp, name, namelen, flags);+ error = xfs_attr_args_init(&args, dp, name, flags); if (error) return error;diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.hindex 106a2f2..44dd07a 100644 --- a/fs/xfs/libxfs/xfs_attr.h +++ b/fs/xfs/libxfs/xfs_attr.h @@ -144,14 +144,12 @@ int xfs_attr_list_int_ilocked(struct xfs_attr_list_context *); int xfs_attr_list_int(struct xfs_attr_list_context *); int xfs_inode_hasattr(struct xfs_inode *ip); int xfs_attr_get_ilocked(struct xfs_inode *ip, struct xfs_da_args *args); -int xfs_attr_get(struct xfs_inode *ip, const unsigned char *name, - size_t namelen, unsigned char **value, int *valuelenp, - int flags); -int xfs_attr_set(struct xfs_inode *dp, const unsigned char *name, - size_t namelen, unsigned char *value, int valuelen, int flags); +int xfs_attr_get(struct xfs_inode *ip, struct xfs_name *name, + unsigned char **value, int *valuelenp, int flags); +int xfs_attr_set(struct xfs_inode *dp, struct xfs_name *name, + unsigned char *value, int valuelen, int flags); int xfs_attr_set_args(struct xfs_da_args *args); -int xfs_attr_remove(struct xfs_inode *dp, const unsigned char *name, - size_t namelen, int flags); +int xfs_attr_remove(struct xfs_inode *dp, struct xfs_name *name, int flags); int xfs_attr_remove_args(struct xfs_da_args *args); int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize, int flags, struct attrlist_cursor_kern *cursor); diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 12be708..e868755 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -113,7 +113,7 @@ xfs_get_acl(struct inode *inode, int type) struct xfs_inode *ip = XFS_I(inode); struct posix_acl *acl = NULL; struct xfs_acl *xfs_acl = NULL; - unsigned char *ea_name; + struct xfs_name name; int error; int len;@@ -121,10 +121,10 @@ xfs_get_acl(struct inode *inode, int type) switch (type) {case ACL_TYPE_ACCESS: - ea_name = SGI_ACL_FILE; + name.name = SGI_ACL_FILE; break; case ACL_TYPE_DEFAULT: - ea_name = SGI_ACL_DEFAULT; + name.name = SGI_ACL_DEFAULT; break; default: BUG(); @@ -135,9 +135,9 @@ xfs_get_acl(struct inode *inode, int type) * go out to the disk. */ len = XFS_ACL_MAX_SIZE(ip->i_mount); - error = xfs_attr_get(ip, ea_name, strlen(ea_name), - (unsigned char **)&xfs_acl, &len, - ATTR_ALLOC | ATTR_ROOT); + name.len = strlen(name.name); + error = xfs_attr_get(ip, &name, (unsigned char **)&xfs_acl, &len, + ATTR_ALLOC | ATTR_ROOT); if (error) { /* * If the attribute doesn't exist make sure we have a negative @@ -157,17 +157,17 @@ int __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) { struct xfs_inode *ip = XFS_I(inode); - unsigned char *ea_name; + struct xfs_name name; int error;switch (type) {case ACL_TYPE_ACCESS: - ea_name = SGI_ACL_FILE; + name.name = SGI_ACL_FILE; break; case ACL_TYPE_DEFAULT: if (!S_ISDIR(inode->i_mode)) return acl ? -EACCES : 0; - ea_name = SGI_ACL_DEFAULT; + name.name = SGI_ACL_DEFAULT; break; default: return -EINVAL; @@ -187,17 +187,16 @@ __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) len -= sizeof(struct xfs_acl_entry) * (XFS_ACL_MAX_ENTRIES(ip->i_mount) - acl->a_count);- error = xfs_attr_set(ip, ea_name, strlen(ea_name),- (unsigned char *)xfs_acl, len, ATTR_ROOT); + name.len = strlen(name.name);/me wonders if you ought to write a helper function to initialize an xfs_name and calculate name->len instead of open coding it here because...
+ error = xfs_attr_set(ip, &name, (unsigned char *)xfs_acl, len, + ATTR_ROOT);kmem_free(xfs_acl);} else { /* * A NULL ACL argument means we want to remove the ACL. */ - error = xfs_attr_remove(ip, ea_name, - strlen(ea_name), - ATTR_ROOT); + error = xfs_attr_remove(ip, &name, ATTR_ROOT);
Ok, will fix. Thanks for catch! Allison
..I think name.len is uninitialized here? --D/** If the attribute didn't exist to start with that's fine. diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 269c321..ae0ed88 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -432,7 +432,10 @@ xfs_attrmulti_attr_get( { unsigned char *kbuf; int error = -EFAULT; - size_t namelen; + struct xfs_name xname = { + .name = name, + .len = strlen(name), + };if (*len > XFS_XATTR_SIZE_MAX)return -EINVAL; @@ -440,9 +443,7 @@ xfs_attrmulti_attr_get( if (!kbuf) return -ENOMEM;- namelen = strlen(name);- error = xfs_attr_get(XFS_I(inode), name, namelen, &kbuf, (int *)len, - flags); + error = xfs_attr_get(XFS_I(inode), &xname, &kbuf, (int *)len, flags); if (error) goto out_kfree;@@ -464,7 +465,7 @@ xfs_attrmulti_attr_set({ unsigned char *kbuf; int error; - size_t namelen; + struct xfs_name xname;if (IS_IMMUTABLE(inode) || IS_APPEND(inode))return -EPERM; @@ -475,8 +476,9 @@ xfs_attrmulti_attr_set( if (IS_ERR(kbuf)) return PTR_ERR(kbuf);- namelen = strlen(name);- error = xfs_attr_set(XFS_I(inode), name, namelen, kbuf, len, flags); + xname.name = name; + xname.len = strlen(name); + error = xfs_attr_set(XFS_I(inode), &xname, kbuf, len, flags); if (!error) xfs_forget_acl(inode, name, flags); kfree(kbuf); @@ -490,12 +492,15 @@ xfs_attrmulti_attr_remove( uint32_t flags) { int error; - size_t namelen; + struct xfs_name xname = { + .name = name, + .len = strlen(name), + };if (IS_IMMUTABLE(inode) || IS_APPEND(inode))return -EPERM; - namelen = strlen(name); - error = xfs_attr_remove(XFS_I(inode), name, namelen, flags); + + error = xfs_attr_remove(XFS_I(inode), &xname, flags); if (!error) xfs_forget_acl(inode, name, flags); return error; diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 7f47f87..aef346e 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -49,9 +49,12 @@ xfs_initxattrs( int error = 0;for (xattr = xattr_array; xattr->name != NULL; xattr++) {- error = xfs_attr_set(ip, xattr->name, - strlen(xattr->name), - xattr->value, xattr->value_len, + struct xfs_name name = { + .name = xattr->name, + .len = strlen(xattr->name), + }; + + error = xfs_attr_set(ip, &name, xattr->value, xattr->value_len, ATTR_SECURE); if (error < 0) break; diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c index 59ffe6c..6c5321d 100644 --- a/fs/xfs/xfs_xattr.c +++ b/fs/xfs/xfs_xattr.c @@ -20,10 +20,13 @@ static int xfs_xattr_get(const struct xattr_handler *handler, struct dentry *unused, struct inode *inode, const char *name, void *value, size_t size) { - int xflags = handler->flags; - struct xfs_inode *ip = XFS_I(inode); - int error, asize = size; - size_t namelen = strlen(name); + int xflags = handler->flags; + struct xfs_inode *ip = XFS_I(inode); + int error, asize = size; + struct xfs_name xname = { + .name = name, + .len = strlen(name), + };/* Convert Linux syscall to XFS internal ATTR flags */if (!size) { @@ -31,8 +34,8 @@ xfs_xattr_get(const struct xattr_handler *handler, struct dentry *unused, value = NULL; }- error = xfs_attr_get(ip, name, namelen, (unsigned char **)&value,- &asize, xflags); + error = xfs_attr_get(ip, &xname, (unsigned char **)&value, &asize, + xflags); if (error) return error; return asize; @@ -68,7 +71,10 @@ 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); + struct xfs_name xname = { + .name = name, + .len = strlen(name), + };/* Convert Linux syscall to XFS internal ATTR flags */if (flags & XATTR_CREATE) @@ -77,9 +83,8 @@ xfs_xattr_set(const struct xattr_handler *handler, struct dentry *unused, xflags |= ATTR_REPLACE;if (!value)- return xfs_attr_remove(ip, name, - namelen, xflags); - error = xfs_attr_set(ip, name, namelen, (void *)value, size, xflags); + return xfs_attr_remove(ip, &xname, xflags); + error = xfs_attr_set(ip, &xname, (void *)value, size, xflags); if (!error) xfs_forget_acl(inode, name, xflags);--2.7.4
