xfs: refactor name/value iovec validation in xlog_recover_attri_commit_pass2

Hoist the code that checks the attr name and value iovecs into separate
helpers so that we can add more callsites for the new parent pointer
attr intent items.

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

diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index c8f92166b9ad65f5526c1dbf7379115f7f4e3dd3..39536303a7b64a2d6f40108be9824897ecf1f32f 100644 (file)
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -734,6 +734,46 @@ const struct xfs_defer_op_type xfs_attr_defer_type = {
        .relog_intent   = xfs_attr_relog_intent,
 };
 
+static inline void *
+xfs_attri_validate_name_iovec(
+       struct xfs_mount                *mp,
+       struct xfs_attri_log_format     *attri_formatp,
+       const struct xfs_log_iovec      *iovec,
+       unsigned int                    name_len)
+{
+       if (iovec->i_len != xlog_calc_iovec_len(name_len)) {
+               XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
+                               attri_formatp, sizeof(*attri_formatp));
+               return NULL;
+       }
+
+       if (!xfs_attr_namecheck(iovec->i_addr, name_len)) {
+               XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
+                               attri_formatp, sizeof(*attri_formatp));
+               XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
+                               iovec->i_addr, iovec->i_len);
+               return NULL;
+       }
+
+       return iovec->i_addr;
+}
+
+static inline void *
+xfs_attri_validate_value_iovec(
+       struct xfs_mount                *mp,
+       struct xfs_attri_log_format     *attri_formatp,
+       const struct xfs_log_iovec      *iovec,
+       unsigned int                    value_len)
+{
+       if (iovec->i_len != xlog_calc_iovec_len(value_len)) {
+               XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
+                               attri_formatp, sizeof(*attri_formatp));
+               return NULL;
+       }
+
+       return iovec->i_addr;
+}
+
 STATIC int
 xlog_recover_attri_commit_pass2(
        struct xlog                     *log,
@@ -798,30 +838,18 @@ xlog_recover_attri_commit_pass2(
        i++;
 
        /* Validate the attr name */
-       if (item->ri_buf[i].i_len != xlog_calc_iovec_len(name_len)) {
-               XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
-                               attri_formatp, len);
-               return -EFSCORRUPTED;
-       }
-
-       attr_name = item->ri_buf[i].i_addr;
-       if (!xfs_attr_namecheck(attr_name, name_len)) {
-               XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
-                               attri_formatp, len);
+       attr_name = xfs_attri_validate_name_iovec(mp, attri_formatp,
+                       &item->ri_buf[i], name_len);
+       if (!attr_name)
                return -EFSCORRUPTED;
-       }
        i++;
 
        /* Validate the attr value, if present */
        if (value_len != 0) {
-               if (item->ri_buf[i].i_len != xlog_calc_iovec_len(value_len)) {
-                       XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
-                                       item->ri_buf[0].i_addr,
-                                       item->ri_buf[0].i_len);
+               attr_value = xfs_attri_validate_value_iovec(mp, attri_formatp,
+                               &item->ri_buf[i], value_len);
+               if (!attr_value)
                        return -EFSCORRUPTED;
-               }
-
-               attr_value = item->ri_buf[i].i_addr;
                i++;
        }