xfs_repair: use libxfs extsize/cowextsize validation helpers

Now that we've ported the extent size hint verifiers to libxfs, call
them from xfs_repair instead of open-coding the checks.  Tweak the
repair message slightly to reflect the fact that we zero the field and
clear the inode flag if the hint is garbage or is inconsistent with the
inode flags.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index 74a5af16d334c09620f7dd4427b1d0ab570f0a4a..641d193c60270dd4b4c080d996d35f602583cea1 100644 (file)
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -97,6 +97,8 @@
 #define xfs_dinode_calc_crc            libxfs_dinode_calc_crc
 #define xfs_idata_realloc              libxfs_idata_realloc
 #define xfs_idestroy_fork              libxfs_idestroy_fork
+#define xfs_inode_validate_extsize     libxfs_inode_validate_extsize
+#define xfs_inode_validate_cowextsize  libxfs_inode_validate_cowextsize
 
 #define xfs_rmap_ag_owner              libxfs_rmap_ag_owner
 #define xfs_rmap_alloc                 libxfs_rmap_alloc

diff --git a/repair/dinode.c b/repair/dinode.c
index 036f484572ab9b6ca62ed5c62b673bad60be4a23..e3b0cdc9c9016ed60e7c869f6703fa52331a70e2 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -2841,24 +2841,21 @@ _("bad (negative) size %" PRId64 " on inode %" PRIu64 "\n"),
         * only regular files with REALTIME or EXTSIZE flags set can have
         * extsize set, or directories with EXTSZINHERIT.
         */
-       if (be32_to_cpu(dino->di_extsize) != 0) {
-               if ((type == XR_INO_RTDATA) ||
-                   (type == XR_INO_DIR && (be16_to_cpu(dino->di_flags) &
-                                       XFS_DIFLAG_EXTSZINHERIT)) ||
-                   (type == XR_INO_DATA && (be16_to_cpu(dino->di_flags) &
-                                XFS_DIFLAG_EXTSIZE)))  {
-                       /* s'okay */ ;
-               } else {
-                       do_warn(
-_("bad non-zero extent size %u for non-realtime/extsize inode %" PRIu64 ", "),
-                                       be32_to_cpu(dino->di_extsize), lino);
-                       if (!no_modify)  {
-                               do_warn(_("resetting to zero\n"));
-                               dino->di_extsize = 0;
-                               *dirty = 1;
-                       } else
-                               do_warn(_("would reset to zero\n"));
-               }
+       if (libxfs_inode_validate_extsize(mp,
+                       be32_to_cpu(dino->di_extsize),
+                       be16_to_cpu(dino->di_mode),
+                       be16_to_cpu(dino->di_flags)) != NULL) {
+               do_warn(
+_("Bad extent size %u on inode %" PRIu64 ", "),
+                               be32_to_cpu(dino->di_extsize), lino);
+               if (!no_modify)  {
+                       do_warn(_("resetting to zero\n"));
+                       dino->di_extsize = 0;
+                       dino->di_flags &= ~cpu_to_be16(XFS_DIFLAG_EXTSIZE |
+                                                      XFS_DIFLAG_EXTSZINHERIT);
+                       *dirty = 1;
+               } else
+                       do_warn(_("would reset to zero\n"));
        }
 
        /*
@@ -2866,41 +2863,21 @@ _("bad non-zero extent size %u for non-realtime/extsize inode %" PRIu64 ", "),
         * set can have extsize set.
         */
        if (dino->di_version >= 3 &&
-           be32_to_cpu(dino->di_cowextsize) != 0) {
-               if ((type == XR_INO_DIR || type == XR_INO_DATA) &&
-                   (be64_to_cpu(dino->di_flags2) &
-                                       XFS_DIFLAG2_COWEXTSIZE)) {
-                       /* s'okay */ ;
-               } else {
-                       do_warn(
-_("Cannot have non-zero CoW extent size %u on non-cowextsize inode %" PRIu64 ", "),
-                                       be32_to_cpu(dino->di_cowextsize), lino);
-                       if (!no_modify)  {
-                               do_warn(_("resetting to zero\n"));
-                               dino->di_flags2 &= ~cpu_to_be64(XFS_DIFLAG2_COWEXTSIZE);
-                               dino->di_cowextsize = 0;
-                               *dirty = 1;
-                       } else
-                               do_warn(_("would reset to zero\n"));
-               }
-       }
-
-       /*
-        * Can't have the COWEXTSIZE flag set with no hint.
-        */
-       if (dino->di_version >= 3 &&
-           be32_to_cpu(dino->di_cowextsize) == 0 &&
-           (be64_to_cpu(dino->di_flags2) & XFS_DIFLAG2_COWEXTSIZE)) {
+           libxfs_inode_validate_cowextsize(mp,
+                       be32_to_cpu(dino->di_cowextsize),
+                       be16_to_cpu(dino->di_mode),
+                       be16_to_cpu(dino->di_flags),
+                       be64_to_cpu(dino->di_flags2)) != NULL) {
                do_warn(
-_("Cannot have CoW extent size of zero on cowextsize inode %" PRIu64 ", "),
-                               lino);
+_("Bad CoW extent size %u on inode %" PRIu64 ", "),
+                               be32_to_cpu(dino->di_cowextsize), lino);
                if (!no_modify)  {
-                       do_warn(_("clearing cowextsize flag\n"));
+                       do_warn(_("resetting to zero\n"));
                        dino->di_flags2 &= ~cpu_to_be64(XFS_DIFLAG2_COWEXTSIZE);
+                       dino->di_cowextsize = 0;
                        *dirty = 1;
-               } else {
-                       do_warn(_("would clear cowextsize flag\n"));
-               }
+               } else
+                       do_warn(_("would reset to zero\n"));
        }
 
        /* nsec fields cannot be larger than 1 billion */