From: Carlos Maiolino <cem@kernel.org>
To: Andrey Albershteyn <aalbersh@redhat.com>
Cc: linux-xfs@vger.kernel.org, djwong@kernel.org, hch@infradead.org
Subject: Re: [PATCH v4 2/4] xfs_repair: make duration take time_t
Date: Tue, 23 Apr 2024 14:06:00 +0200 [thread overview]
Message-ID: <ztbcnzbz3ff56jb6dlndh2c4nd5o6q6a6ku6l24z5ow7urkg6w@l4bwypdpdtaz> (raw)
In-Reply-To: <20240417161646.963612-3-aalbersh@redhat.com>
> extern int ag_stride;
> diff --git a/repair/progress.c b/repair/progress.c
> index f6c4d988444e..71042fbbfa4c 100644
> --- a/repair/progress.c
> +++ b/repair/progress.c
> @@ -268,12 +268,13 @@ progress_rpt_thread (void *p)
> _("\t- %02d:%02d:%02d: Phase %d: elapsed time %s - processed %d %s per minute\n"),
> tmp->tm_hour, tmp->tm_min, tmp->tm_sec,
> current_phase, duration(elapsed, msgbuf),
> - (int) (60*sum/(elapsed)), *msgp->format->type);
> + 60 * sum / elapsed, *msgp->format->type);
^ Type differs from print format.
Carlos
> do_log(
> _("\t- %02d:%02d:%02d: Phase %d: %" PRIu64 "%% done - estimated remaining time %s\n"),
> tmp->tm_hour, tmp->tm_min, tmp->tm_sec,
> current_phase, percent,
> - duration((int) ((*msgp->total - sum) * (elapsed)/sum), msgbuf));
> + duration((*msgp->total - sum) * elapsed / sum,
> + msgbuf));
> }
>
> if (pthread_mutex_unlock(&msgp->mutex) != 0) {
> @@ -420,7 +421,7 @@ timestamp(int end, int phase, char *buf)
> }
>
> char *
> -duration(int length, char *buf)
> +duration(time_t length, char *buf)
> {
> int sum;
> int weeks;
> diff --git a/repair/progress.h b/repair/progress.h
> index 2c1690db1b17..9575df164aa0 100644
> --- a/repair/progress.h
> +++ b/repair/progress.h
> @@ -38,7 +38,7 @@ extern void summary_report(void);
> extern int set_progress_msg(int report, uint64_t total);
> extern uint64_t print_final_rpt(void);
> extern char *timestamp(int end, int phase, char *buf);
> -extern char *duration(int val, char *buf);
> +extern char *duration(time_t val, char *buf);
> extern int do_parallel;
>
> #define PROG_RPT_INC(a,b) if (ag_stride && prog_rpt_done) (a) += (b)
> diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
> index ba9d28330d82..2ceea87dc57d 100644
> --- a/repair/xfs_repair.c
> +++ b/repair/xfs_repair.c
> @@ -377,7 +377,7 @@ process_args(int argc, char **argv)
> do_prefetch = 0;
> break;
> case 't':
> - report_interval = (int)strtol(optarg, NULL, 0);
> + report_interval = strtol(optarg, NULL, 0);
> break;
> case 'e':
> report_corrected = true;
> --
> 2.42.0
>
>
next prev parent reply other threads:[~2024-04-23 12:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-17 16:16 [PATCH v4 0/4] xfsprogs random fixes found by Coverity scan Andrey Albershteyn
2024-04-17 16:16 ` [PATCH v4 1/4] xfs_db: fix leak in flist_find_ftyp() Andrey Albershteyn
2024-04-17 16:16 ` [PATCH v4 2/4] xfs_repair: make duration take time_t Andrey Albershteyn
2024-04-18 4:26 ` Christoph Hellwig
2024-04-23 12:06 ` Carlos Maiolino [this message]
2024-04-17 16:16 ` [PATCH v4 3/4] xfs_scrub: don't call phase_end if phase_rusage was not initialized Andrey Albershteyn
2024-04-18 4:26 ` Christoph Hellwig
2024-04-17 16:16 ` [PATCH v4 4/4] xfs_fsr: convert fsrallfs to use time_t instead of int Andrey Albershteyn
2024-04-18 4:27 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ztbcnzbz3ff56jb6dlndh2c4nd5o6q6a6ku6l24z5ow7urkg6w@l4bwypdpdtaz \
--to=cem@kernel.org \
--cc=aalbersh@redhat.com \
--cc=djwong@kernel.org \
--cc=hch@infradead.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).