| Message ID | 20231211163742.837427-7-hch@lst.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [01/23] libxfs: remove the unused icache_flags member from struct libxfs_xinit | expand |
On Mon, Dec 11, 2023 at 05:37:25PM +0100, Christoph Hellwig wrote: > 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: Carlos Maiolino <cmaiolino@redhat.com> > --- > copy/xfs_copy.c | 2 +- > db/metadump.c | 4 ++-- > db/sb.c | 2 +- > include/libxlog.h | 3 +-- > libxlog/util.c | 8 +------- > 5 files changed, 6 insertions(+), 13 deletions(-) > > diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c > index 66728f199..4bd473a04 100644 > --- 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 f9c82148e..e57b024cd 100644 > --- 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 2d508c26a..a3a4a758f 100644 > --- 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 3ade7ffaf..a598a7b3c 100644 > --- 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 ad60036f8..1022e3378 100644 > --- 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; > > -- > 2.39.2 >
diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c index 66728f199..4bd473a04 100644 --- 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 f9c82148e..e57b024cd 100644 --- 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 2d508c26a..a3a4a758f 100644 --- 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 3ade7ffaf..a598a7b3c 100644 --- 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 ad60036f8..1022e3378 100644 --- 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;
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> --- copy/xfs_copy.c | 2 +- db/metadump.c | 4 ++-- db/sb.c | 2 +- include/libxlog.h | 3 +-- libxlog/util.c | 8 +------- 5 files changed, 6 insertions(+), 13 deletions(-)