libxlog: remove the verbose argument to xlog_is_dirty

No caller passes a non-zero verbose argument to xlog_is_dirty.
Remove the argument the code keyed off by it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index 66728f199325d41e1082d61c75bfa0dfc7cda742..4bd473a04bba129b181ec8dafde72508bb045350 100644 (file)
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -784,7 +784,7 @@ main(int argc, char **argv)
         */
        memset(&xlog, 0, sizeof(struct xlog));
        mp->m_log = &xlog;
-       c = xlog_is_dirty(mp, mp->m_log, &xargs, 0);
+       c = xlog_is_dirty(mp, mp->m_log, &xargs);
        if (!duplicate) {
                if (c == 1) {
                        do_log(_(

diff --git a/db/metadump.c b/db/metadump.c
index f9c82148e7dfb0763ec7f37151d9e5c3d22dba6f..e57b024cd055c757f2e9af84d0736bbd195ae651 100644 (file)
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -2615,7 +2615,7 @@ copy_log(void)
        if (!metadump.obfuscate && !metadump.zero_stale_data)
                goto done;
 
-       dirty = xlog_is_dirty(mp, &log, &x, 0);
+       dirty = xlog_is_dirty(mp, &log, &x);
 
        switch (dirty) {
        case 0:
@@ -2945,7 +2945,7 @@ metadump_f(
                if (iocur_top->data) {  /* best effort */
                        struct xlog     log;
 
-                       if (xlog_is_dirty(mp, &log, &x, 0))
+                       if (xlog_is_dirty(mp, &log, &x))
                                metadump.dirty_log = true;
                }
                pop_cur();

diff --git a/db/sb.c b/db/sb.c
index 2d508c26a3b7d2ad04de26634b6a16706fb15dca..a3a4a758f5001ce691383fbc00c8557892fcf2fd 100644 (file)
--- a/db/sb.c
+++ b/db/sb.c
@@ -235,7 +235,7 @@ sb_logcheck(void)
 
        libxfs_buftarg_init(mp, x.ddev, x.logdev, x.rtdev);
 
-       dirty = xlog_is_dirty(mp, mp->m_log, &x, 0);
+       dirty = xlog_is_dirty(mp, mp->m_log, &x);
        if (dirty == -1) {
                dbprintf(_("ERROR: cannot find log head/tail, run xfs_repair\n"));
                return 0;

diff --git a/include/libxlog.h b/include/libxlog.h
index 3ade7ffaf5a3be7614fc068d7f2ded6013f7685c..a598a7b3c2c5115a2d23f69c4fc99cceb5e90959 100644 (file)
--- a/include/libxlog.h
+++ b/include/libxlog.h
@@ -71,9 +71,8 @@ extern int    print_record_header;
 /* libxfs parameters */
 extern libxfs_init_t   x;
 
+int xlog_is_dirty(struct xfs_mount *mp, struct xlog *log, libxfs_init_t *x);
 
-extern int xlog_is_dirty(struct xfs_mount *, struct xlog *, libxfs_init_t *,
-                        int);
 extern struct xfs_buf *xlog_get_bp(struct xlog *, int);
 extern int     xlog_bread(struct xlog *log, xfs_daddr_t blk_no, int nbblks,
                                struct xfs_buf *bp, char **offset);

diff --git a/libxlog/util.c b/libxlog/util.c
index ad60036f86405963625c980474a8e7af2a007074..1022e3378e073ad95701eda6e609e05a0955ea83 100644 (file)
--- a/libxlog/util.c
+++ b/libxlog/util.c
@@ -19,8 +19,7 @@ int
 xlog_is_dirty(
        struct xfs_mount        *mp,
        struct xlog             *log,
-       libxfs_init_t           *x,
-       int                     verbose)
+       libxfs_init_t           *x)
 {
        int                     error;
        xfs_daddr_t             head_blk, tail_blk;
@@ -58,11 +57,6 @@ xlog_is_dirty(
                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;