xfs_repair: push inode buf and dinode pointers all the way to inode fork processing

Currently, the process_dinode* family of functions assume that they have
the buffer backing the inodes locked, and therefore the dinode pointer
won't ever change.  However, the bmbt rebuilding code in the next patch
will violate that assumption, so we must pass pointers to the inobp and
the dinode pointer (that is to say, double pointers) all the way through
to process_inode_{data,attr}_fork so that we can regrab the buffer after
the rebuilding step finishes.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bill O'Donnell <bodonnel@redhat.com>

diff --git a/repair/dino_chunks.c b/repair/dino_chunks.c
index 171756818a6a3ab5c509f9f297b86811ef3eb625..1953613345190d6386b5e460991d81b9ca3b596b 100644 (file)
--- a/repair/dino_chunks.c
+++ b/repair/dino_chunks.c
@@ -851,10 +851,11 @@ next_readbuf:
                ino_dirty = 0;
                parent = 0;
 
-               status = process_dinode(mp, dino, agno, agino,
+               status = process_dinode(mp, &dino, agno, agino,
                                is_inode_free(ino_rec, irec_offset),
                                &ino_dirty, &is_used,ino_discovery, check_dups,
-                               extra_attr_check, &isa_dir, &parent);
+                               extra_attr_check, &isa_dir, &parent,
+                               &bplist[bp_index]);
 
                ASSERT(is_used != 3);
                if (ino_dirty) {

diff --git a/repair/dinode.c b/repair/dinode.c
index 164f51d4c4fc2f1069cf8cb68d22877c04a4e0ba..a18af3ff77722bbe51e64ae76f4e87a4a08bee25 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -1893,17 +1893,19 @@ _("nblocks (%" PRIu64 ") smaller than nextents for inode %" PRIu64 "\n"), nblock
  */
 static int
 process_inode_data_fork(
-       xfs_mount_t             *mp,
+       struct xfs_mount        *mp,
        xfs_agnumber_t          agno,
        xfs_agino_t             ino,
-       struct xfs_dinode       *dino,
+       struct xfs_dinode       **dinop,
        int                     type,
        int                     *dirty,
        xfs_rfsblock_t          *totblocks,
        xfs_extnum_t            *nextents,
        blkmap_t                **dblkmap,
-       int                     check_dups)
+       int                     check_dups,
+       struct xfs_buf          **ino_bpp)
 {
+       struct xfs_dinode       *dino = *dinop;
        xfs_ino_t               lino = XFS_AGINO_TO_INO(mp, agno, ino);
        int                     err = 0;
        xfs_extnum_t            nex, max_nex;
@@ -2005,20 +2007,22 @@ process_inode_data_fork(
  */
 static int
 process_inode_attr_fork(
-       xfs_mount_t             *mp,
+       struct xfs_mount        *mp,
        xfs_agnumber_t          agno,
        xfs_agino_t             ino,
-       struct xfs_dinode       *dino,
+       struct xfs_dinode       **dinop,
        int                     type,
        int                     *dirty,
        xfs_rfsblock_t          *atotblocks,
        xfs_extnum_t            *anextents,
        int                     check_dups,
        int                     extra_attr_check,
-       int                     *retval)
+       int                     *retval,
+       struct xfs_buf          **ino_bpp)
 {
        xfs_ino_t               lino = XFS_AGINO_TO_INO(mp, agno, ino);
-       blkmap_t                *ablkmap = NULL;
+       struct xfs_dinode       *dino = *dinop;
+       struct blkmap           *ablkmap = NULL;
        int                     repair = 0;
        int                     err;
 
@@ -2077,7 +2081,7 @@ process_inode_attr_fork(
                 * XXX - put the inode onto the "move it" list and
                 *      log the the attribute scrubbing
                 */
-               do_warn(_("bad attribute fork in inode %" PRIu64), lino);
+               do_warn(_("bad attribute fork in inode %" PRIu64 "\n"), lino);
 
                if (!no_modify)  {
                        do_warn(_(", clearing attr fork\n"));
@@ -2274,21 +2278,22 @@ _("Bad extent size hint %u on inode %" PRIu64 ", "),
  * for detailed, info, look at process_dinode() comments.
  */
 static int
-process_dinode_int(xfs_mount_t *mp,
-               struct xfs_dinode *dino,
-               xfs_agnumber_t agno,
-               xfs_agino_t ino,
-               int was_free,           /* 1 if inode is currently free */
-               int *dirty,             /* out == > 0 if inode is now dirty */
-               int *used,              /* out == 1 if inode is in use */
-               int verify_mode,        /* 1 == verify but don't modify inode */
-               int uncertain,          /* 1 == inode is uncertain */
-               int ino_discovery,      /* 1 == check dirs for unknown inodes */
-               int check_dups,         /* 1 == check if inode claims
-                                        * duplicate blocks             */
-               int extra_attr_check, /* 1 == do attribute format and value checks */
-               int *isa_dir,           /* out == 1 if inode is a directory */
-               xfs_ino_t *parent)      /* out -- parent if ino is a dir */
+process_dinode_int(
+       struct xfs_mount        *mp,
+       struct xfs_dinode       **dinop,
+       xfs_agnumber_t          agno,
+       xfs_agino_t             ino,
+       int                     was_free,       /* 1 if inode is currently free */
+       int                     *dirty,         /* out == > 0 if inode is now dirty */
+       int                     *used,          /* out == 1 if inode is in use */
+       int                     verify_mode,    /* 1 == verify but don't modify inode */
+       int                     uncertain,      /* 1 == inode is uncertain */
+       int                     ino_discovery,  /* 1 == check dirs for unknown inodes */
+       int                     check_dups,     /* 1 == check if inode claims duplicate blocks */
+       int                     extra_attr_check, /* 1 == do attribute format and value checks */
+       int                     *isa_dir,       /* out == 1 if inode is a directory */
+       xfs_ino_t               *parent,        /* out -- parent if ino is a dir */
+       struct xfs_buf          **ino_bpp)
 {
        xfs_rfsblock_t          totblocks = 0;
        xfs_rfsblock_t          atotblocks = 0;
@@ -2301,6 +2306,7 @@ process_dinode_int(xfs_mount_t *mp,
        const int               is_free = 0;
        const int               is_used = 1;
        blkmap_t                *dblkmap = NULL;
+       struct xfs_dinode       *dino = *dinop;
        xfs_agino_t             unlinked_ino;
        struct xfs_perag        *pag;
 
@@ -2324,6 +2330,7 @@ process_dinode_int(xfs_mount_t *mp,
         * If uncertain is set, verify_mode MUST be set.
         */
        ASSERT(uncertain == 0 || verify_mode != 0);
+       ASSERT(ino_bpp != NULL || verify_mode != 0);
 
        /*
         * This is the only valid point to check the CRC; after this we may have
@@ -2863,18 +2870,21 @@ _("Bad CoW extent size %u on inode %" PRIu64 ", "),
        /*
         * check data fork -- if it's bad, clear the inode
         */
-       if (process_inode_data_fork(mp, agno, ino, dino, type, dirty,
-                       &totblocks, &nextents, &dblkmap, check_dups) != 0)
+       if (process_inode_data_fork(mp, agno, ino, dinop, type, dirty,
+                       &totblocks, &nextents, &dblkmap, check_dups,
+                       ino_bpp) != 0)
                goto bad_out;
+       dino = *dinop;
 
        /*
         * check attribute fork if necessary.  attributes are
         * always stored in the regular filesystem.
         */
-       if (process_inode_attr_fork(mp, agno, ino, dino, type, dirty,
+       if (process_inode_attr_fork(mp, agno, ino, dinop, type, dirty,
                        &atotblocks, &anextents, check_dups, extra_attr_check,
-                       &retval))
+                       &retval, ino_bpp))
                goto bad_out;
+       dino = *dinop;
 
        /*
         * enforce totblocks is 0 for misc types
@@ -2992,8 +3002,8 @@ bad_out:
 
 int
 process_dinode(
-       xfs_mount_t             *mp,
-       struct xfs_dinode       *dino,
+       struct xfs_mount        *mp,
+       struct xfs_dinode       **dinop,
        xfs_agnumber_t          agno,
        xfs_agino_t             ino,
        int                     was_free,
@@ -3003,7 +3013,8 @@ process_dinode(
        int                     check_dups,
        int                     extra_attr_check,
        int                     *isa_dir,
-       xfs_ino_t               *parent)
+       xfs_ino_t               *parent,
+       struct xfs_buf          **ino_bpp)
 {
        const int               verify_mode = 0;
        const int               uncertain = 0;
@@ -3011,9 +3022,10 @@ process_dinode(
 #ifdef XR_INODE_TRACE
        fprintf(stderr, _("processing inode %d/%d\n"), agno, ino);
 #endif
-       return process_dinode_int(mp, dino, agno, ino, was_free, dirty, used,
-                               verify_mode, uncertain, ino_discovery,
-                               check_dups, extra_attr_check, isa_dir, parent);
+       return process_dinode_int(mp, dinop, agno, ino, was_free, dirty, used,
+                       verify_mode, uncertain, ino_discovery,
+                       check_dups, extra_attr_check, isa_dir, parent,
+                       ino_bpp);
 }
 
 /*
@@ -3038,9 +3050,9 @@ verify_dinode(
        const int               ino_discovery = 0;
        const int               uncertain = 0;
 
-       return process_dinode_int(mp, dino, agno, ino, 0, &dirty, &used,
-                               verify_mode, uncertain, ino_discovery,
-                               check_dups, 0, &isa_dir, &parent);
+       return process_dinode_int(mp, &dino, agno, ino, 0, &dirty, &used,
+                       verify_mode, uncertain, ino_discovery,
+                       check_dups, 0, &isa_dir, &parent, NULL);
 }
 
 /*
@@ -3064,7 +3076,7 @@ verify_uncertain_dinode(
        const int               ino_discovery = 0;
        const int               uncertain = 1;
 
-       return process_dinode_int(mp, dino, agno, ino, 0, &dirty, &used,
+       return process_dinode_int(mp, &dino, agno, ino, 0, &dirty, &used,
                                verify_mode, uncertain, ino_discovery,
-                               check_dups, 0, &isa_dir, &parent);
+                               check_dups, 0, &isa_dir, &parent, NULL);
 }

diff --git a/repair/dinode.h b/repair/dinode.h
index 333d96d26a2f3e76b12bd75ae520a6d982b4cf20..92df83da621053255d8ae77fafc8a47eca24e914 100644 (file)
--- a/repair/dinode.h
+++ b/repair/dinode.h
@@ -43,8 +43,8 @@ void
 update_rootino(xfs_mount_t *mp);
 
 int
-process_dinode(xfs_mount_t *mp,
-               struct xfs_dinode *dino,
+process_dinode(struct xfs_mount *mp,
+               struct xfs_dinode **dinop,
                xfs_agnumber_t agno,
                xfs_agino_t ino,
                int was_free,
@@ -54,7 +54,8 @@ process_dinode(xfs_mount_t *mp,
                int check_dups,
                int extra_attr_check,
                int *isa_dir,
-               xfs_ino_t *parent);
+               xfs_ino_t *parent,
+               struct xfs_buf **ino_bpp);
 
 int
 verify_dinode(xfs_mount_t *mp,