libxlog: add xlog_is_empty() helper

xfs_repair and xfs_db both check for a dirty log, using roughly
the same cut and pasted code.

Add a new helper to do this, xlog_is_dirty(), and use it instead.

Note, the helper (and the code before it) is a little odd in that
it (re-)initializes some libxfs_init_t members before proceeding,
I haven't yet worked out if that's necessary or correct, so I've
just kept the same behavior for now.  Still, it seems like this
should be done in libxfs_init, or not at all.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/db/sb.c b/db/sb.c
index cc3759a33ccf4b295a687a6a17f619da4968da14..432914d67a1bc8dcf46f923f4dfa0637bdcf5e01 100644 (file)
--- a/db/sb.c
+++ b/db/sb.c
@@ -225,8 +225,7 @@ int xlog_recover_do_trans(struct xlog *log, xlog_recover_t *t, int p)
 int
 sb_logcheck(void)
 {
-       struct xlog     log;
-       xfs_daddr_t     head_blk, tail_blk;
+       int             dirty;
 
        if (mp->m_sb.sb_logstart) {
                if (x.logdev && x.logdev != x.ddev) {
@@ -242,25 +241,14 @@ sb_logcheck(void)
                }
        }
 
-       memset(&log, 0, sizeof(log));
        libxfs_buftarg_init(mp, x.ddev, x.logdev, x.rtdev);
-       x.logBBsize = XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks);
-       x.logBBstart = XFS_FSB_TO_DADDR(mp, mp->m_sb.sb_logstart);
-       x.lbsize = BBSIZE;
-       if (xfs_sb_version_hassector(&mp->m_sb))
-               x.lbsize <<= (mp->m_sb.sb_logsectlog - BBSHIFT);
-
-       log.l_dev = mp->m_logdev_targp;
-       log.l_logBBsize = x.logBBsize;
-       log.l_logBBstart = x.logBBstart;
-       log.l_sectBBsize  = BTOBB(x.lbsize);
-       log.l_mp = mp;
-
-       if (xlog_find_tail(&log, &head_blk, &tail_blk)) {
+
+       dirty = xlog_is_dirty(mp, &x, 0);
+
+       if (dirty == -1) {
                dbprintf(_("ERROR: cannot find log head/tail, run xfs_repair\n"));
                return 0;
-       }
-       if (head_blk != tail_blk) {
+       } else if (dirty == 1) {
                dbprintf(_(
 "ERROR: The filesystem has valuable metadata changes in a log which needs to\n"
 "be replayed.  Mount the filesystem to replay the log, and unmount it before\n"
@@ -270,6 +258,7 @@ sb_logcheck(void)
 "of the filesystem before doing this.\n"), progname);
                return 0;
        }
+       /* Log is clean */
        return 1;
 }
 

diff --git a/include/libxlog.h b/include/libxlog.h
index e6d915ca4e628a6db5c69dedaea6a48d63c1a092..c6640a86acb994ddc7dc3a489d14efa254d9e66a 100644 (file)
--- a/include/libxlog.h
+++ b/include/libxlog.h
@@ -83,6 +83,8 @@ extern int    print_record_header;
 /* libxfs parameters */
 extern libxfs_init_t   x;
 
+
+extern int xlog_is_dirty(xfs_mount_t *mp, libxfs_init_t *x, int verbose);
 extern struct xfs_buf *xlog_get_bp(struct xlog *, int);
 extern void    xlog_put_bp(struct xfs_buf *);
 extern int     xlog_bread(struct xlog *log, xfs_daddr_t blk_no, int nbblks,

diff --git a/libxlog/util.c b/libxlog/util.c
index 053cf042e71d7c3bf33b3bc3737a18c49985417f..498c06ce61229e3b5ec3f6cba38f87610d91bd4b 100644 (file)
--- a/libxlog/util.c
+++ b/libxlog/util.c
@@ -24,6 +24,62 @@ int print_skip_uuid;
 int print_record_header;
 libxfs_init_t x;
 
+/*
+ * Return 1 for dirty, 0 for clean, -1 for errors
+ */
+int
+xlog_is_dirty(
+       xfs_mount_t *mp,
+       libxfs_init_t *x,
+       int verbose)
+{
+       int error;
+       struct xlog     log;
+       xfs_daddr_t head_blk, tail_blk;
+
+       memset(&log, 0, sizeof(log));
+
+       /* We (re-)init members of libxfs_init_t here?  really? */
+       x->logBBsize = XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks);
+       x->logBBstart = XFS_FSB_TO_DADDR(mp, mp->m_sb.sb_logstart);
+       x->lbsize = BBSIZE;
+       if (xfs_sb_version_hassector(&mp->m_sb))
+               x->lbsize <<= (mp->m_sb.sb_logsectlog - BBSHIFT);
+
+       log.l_dev = mp->m_logdev_targp;
+       log.l_logBBsize = x->logBBsize;
+       log.l_logBBstart = x->logBBstart;
+       log.l_sectBBsize = BTOBB(x->lbsize);
+       log.l_mp = mp;
+       if (xfs_sb_version_hassector(&mp->m_sb)) {
+               log.l_sectbb_log = mp->m_sb.sb_logsectlog - BBSHIFT;
+               ASSERT(log.l_sectbb_log <= mp->m_sectbb_log);
+               /* for larger sector sizes, must have v2 or external log */
+               ASSERT(log.l_sectbb_log == 0 ||
+                       log.l_logBBstart == 0 ||
+                       xfs_sb_version_haslogv2(&mp->m_sb));
+               ASSERT(mp->m_sb.sb_logsectlog >= BBSHIFT);
+       }
+       log.l_sectbb_mask = (1 << log.l_sectbb_log) - 1;
+
+       if ((error = xlog_find_tail(&log, &head_blk, &tail_blk))) {
+               xlog_warn(_("%s: cannot find log head/tail "
+                         "(xlog_find_tail=%d)\n"),
+                       __func__, error);
+               return -1;
+       }
+
+       if (verbose)
+               xlog_warn(
+       _("%s: head block %" PRId64 " tail block %" PRId64 "\n"),
+                       __func__, head_blk, tail_blk);
+
+       if (head_blk != tail_blk)
+               return 1;
+
+       return 0;
+}
+
 static int
 header_check_uuid(xfs_mount_t *mp, xlog_rec_header_t *head)
 {

diff --git a/repair/phase2.c b/repair/phase2.c
index 983aaa7613c8b0aa8533a851a86815b4087545b8..a23f472a2b1b9870f91eb82141300038db4c28a3 100644 (file)
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -38,62 +38,31 @@ int xlog_recover_do_trans(struct xlog *log, xlog_recover_t *t, int p)
 static void
 zero_log(xfs_mount_t *mp)
 {
-       int error;
-       struct xlog     log;
-       xfs_daddr_t head_blk, tail_blk;
-
-       memset(&log, 0, sizeof(log));
-       x.logBBsize = XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks);
-       x.logBBstart = XFS_FSB_TO_DADDR(mp, mp->m_sb.sb_logstart);
-       x.lbsize = BBSIZE;
-       if (xfs_sb_version_hassector(&mp->m_sb))
-               x.lbsize <<= (mp->m_sb.sb_logsectlog - BBSHIFT);
-
-       log.l_dev = mp->m_logdev_targp;
-       log.l_logBBsize = x.logBBsize;
-       log.l_logBBstart = x.logBBstart;
-       log.l_sectBBsize  = BTOBB(x.lbsize);
-       log.l_mp = mp;
-       if (xfs_sb_version_hassector(&mp->m_sb)) {
-               log.l_sectbb_log = mp->m_sb.sb_logsectlog - BBSHIFT;
-               ASSERT(log.l_sectbb_log <= mp->m_sectbb_log);
-               /* for larger sector sizes, must have v2 or external log */
-               ASSERT(log.l_sectbb_log == 0 ||
-                       log.l_logBBstart == 0 ||
-                       xfs_sb_version_haslogv2(&mp->m_sb));
-               ASSERT(mp->m_sb.sb_logsectlog >= BBSHIFT);
-       }
-       log.l_sectbb_mask = (1 << log.l_sectbb_log) - 1;
-
-       if ((error = xlog_find_tail(&log, &head_blk, &tail_blk))) {
-               do_warn(_("zero_log: cannot find log head/tail "
-                         "(xlog_find_tail=%d), zeroing it anyway\n"),
-                       error);
-       } else {
-               if (verbose) {
-                       do_warn(
-       _("zero_log: head block %" PRId64 " tail block %" PRId64 "\n"),
-                               head_blk, tail_blk);
-               }
-               if (head_blk != tail_blk) {
-                       if (zap_log) {
-                               do_warn(_(
+       int             dirty;
+
+       dirty = xlog_is_dirty(mp, &x, verbose);
+
+       if (dirty == -1)
+               do_warn(_("zero_log: cannot find log head/tail, "
+                         "zeroing it anyway\n"));
+       else if (dirty == 1) {
+               if (zap_log) {
+                       do_warn(_(
 "ALERT: The filesystem has valuable metadata changes in a log which is being\n"
 "destroyed because the -L option was used.\n"));
-                       } else {
-                               do_warn(_(
+               } else {
+                       do_warn(_(
 "ERROR: The filesystem has valuable metadata changes in a log which needs to\n"
 "be replayed.  Mount the filesystem to replay the log, and unmount it before\n"
 "re-running xfs_repair.  If you are unable to mount the filesystem, then use\n"
 "the -L option to destroy the log and attempt a repair.\n"
 "Note that destroying the log may cause corruption -- please attempt a mount\n"
 "of the filesystem before doing this.\n"));
-                               exit(2);
-                       }
+                       exit(2);
                }
        }
 
-       libxfs_log_clear(log.l_dev,
+       libxfs_log_clear(mp->m_logdev_targp,
                XFS_FSB_TO_DADDR(mp, mp->m_sb.sb_logstart),
                (xfs_extlen_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks),
                &mp->m_sb.sb_uuid,