xfs: rearrange xfs_attr_match parameters

Rearrange the parameters to this function so that they match the order
of attr listent: attr_flags -> name -> namelen -> value -> valuelen.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
index 3b024ab892e68081f29f2b2b4bb2be23da263431..bb00183d134921351c09bf2cd742f8ceff284153 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr_leaf.c
+++ b/fs/xfs/libxfs/xfs_attr_leaf.c
@@ -510,9 +510,9 @@ xfs_attr3_leaf_read(
 static bool
 xfs_attr_match(
        struct xfs_da_args      *args,
-       uint8_t                 namelen,
-       unsigned char           *name,
-       int                     flags)
+       unsigned int            attr_flags,
+       const unsigned char     *name,
+       unsigned int            namelen)
 {
 
        if (args->namelen != namelen)
@@ -522,12 +522,12 @@ xfs_attr_match(
 
        /* Recovery ignores the INCOMPLETE flag. */
        if ((args->op_flags & XFS_DA_OP_RECOVERY) &&
-           args->attr_filter == (flags & XFS_ATTR_NSP_ONDISK_MASK))
+           args->attr_filter == (attr_flags & XFS_ATTR_NSP_ONDISK_MASK))
                return true;
 
        /* All remaining matches need to be filtered by INCOMPLETE state. */
        if (args->attr_filter !=
-           (flags & (XFS_ATTR_NSP_ONDISK_MASK | XFS_ATTR_INCOMPLETE)))
+           (attr_flags & (XFS_ATTR_NSP_ONDISK_MASK | XFS_ATTR_INCOMPLETE)))
                return false;
        return true;
 }
@@ -746,8 +746,8 @@ xfs_attr_sf_findname(
        for (sfe = xfs_attr_sf_firstentry(sf);
             sfe < xfs_attr_sf_endptr(sf);
             sfe = xfs_attr_sf_nextentry(sfe)) {
-               if (xfs_attr_match(args, sfe->namelen, sfe->nameval,
-                               sfe->flags))
+               if (xfs_attr_match(args, sfe->flags, sfe->nameval,
+                                       sfe->namelen))
                        return sfe;
        }
 
@@ -2443,15 +2443,16 @@ xfs_attr3_leaf_lookup_int(
  */
                if (entry->flags & XFS_ATTR_LOCAL) {
                        name_loc = xfs_attr3_leaf_name_local(leaf, probe);
-                       if (!xfs_attr_match(args, name_loc->namelen,
-                                       name_loc->nameval, entry->flags))
+                       if (!xfs_attr_match(args, entry->flags,
+                                               name_loc->nameval,
+                                               name_loc->namelen))
                                continue;
                        args->index = probe;
                        return -EEXIST;
                } else {
                        name_rmt = xfs_attr3_leaf_name_remote(leaf, probe);
-                       if (!xfs_attr_match(args, name_rmt->namelen,
-                                       name_rmt->name, entry->flags))
+                       if (!xfs_attr_match(args, entry->flags, name_rmt->name,
+                                               name_rmt->namelen))
                                continue;
                        args->index = probe;
                        args->rmtvaluelen = be32_to_cpu(name_rmt->valuelen);