scrub kernel messages helps debug and audit, add them to the log. Signed-off-by: Anand Jain <anand.jain@oracle.com> --- v1->v2: fix btrfs_info, using string directly. Add spacing. fs/btrfs/scrub.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 6dcd36d7b849..aadafc3e52c7 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -3903,6 +3903,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, */ nofs_flag = memalloc_nofs_save(); if (!is_dev_replace) { + btrfs_info(fs_info, "scrub: devid %llu started", devid); /* * by holding device list mutex, we can * kick off writing super in log tree sync. @@ -3925,6 +3926,10 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, if (progress) memcpy(progress, &sctx->stat, sizeof(*progress)); + if (!is_dev_replace) + btrfs_info(fs_info, "scrub: devid %llu %s:%d", + devid, ret ? "not finished" : "finished", ret); + mutex_lock(&fs_info->scrub_lock); dev->scrub_ctx = NULL; scrub_workers_put(fs_info); -- 1.8.3.1
On 01/03/2019 04:17 PM, Anand Jain wrote: > scrub kernel messages helps debug and audit, add them to the log. > > Signed-off-by: Anand Jain <anand.jain@oracle.com> Ping. Thanks. > --- > v1->v2: fix btrfs_info, using string directly. Add spacing. > fs/btrfs/scrub.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c > index 6dcd36d7b849..aadafc3e52c7 100644 > --- a/fs/btrfs/scrub.c > +++ b/fs/btrfs/scrub.c > @@ -3903,6 +3903,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, > */ > nofs_flag = memalloc_nofs_save(); > if (!is_dev_replace) { > + btrfs_info(fs_info, "scrub: devid %llu started", devid); > /* > * by holding device list mutex, we can > * kick off writing super in log tree sync. > @@ -3925,6 +3926,10 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, > if (progress) > memcpy(progress, &sctx->stat, sizeof(*progress)); > > + if (!is_dev_replace) > + btrfs_info(fs_info, "scrub: devid %llu %s:%d", > + devid, ret ? "not finished" : "finished", ret); > + > mutex_lock(&fs_info->scrub_lock); > dev->scrub_ctx = NULL; > scrub_workers_put(fs_info); >
On Thu, Jan 03, 2019 at 04:17:40PM +0800, Anand Jain wrote: > scrub kernel messages helps debug and audit, add them to the log. > > Signed-off-by: Anand Jain <anand.jain@oracle.com> > --- > v1->v2: fix btrfs_info, using string directly. Add spacing. > fs/btrfs/scrub.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c > index 6dcd36d7b849..aadafc3e52c7 100644 > --- a/fs/btrfs/scrub.c > +++ b/fs/btrfs/scrub.c > @@ -3903,6 +3903,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, > */ > nofs_flag = memalloc_nofs_save(); > if (!is_dev_replace) { > + btrfs_info(fs_info, "scrub: devid %llu started", devid); > /* > * by holding device list mutex, we can > * kick off writing super in log tree sync. > @@ -3925,6 +3926,10 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, > if (progress) > memcpy(progress, &sctx->stat, sizeof(*progress)); > > + if (!is_dev_replace) > + btrfs_info(fs_info, "scrub: devid %llu %s:%d", > + devid, ret ? "not finished" : "finished", ret); I've checked how the balance status messages are formatted and unified them so it's + btrfs_info(fs_info, "scrub: started on devid %llu", devid); and + btrfs_info(fs_info, "scrub: %s on devid %llu with status: %d", + ret ? "not finished" : "finished", devid, ret); Patch added to misc-next, thanks.
On 01/25/2019 04:21 AM, David Sterba wrote: > On Thu, Jan 03, 2019 at 04:17:40PM +0800, Anand Jain wrote: >> scrub kernel messages helps debug and audit, add them to the log. >> >> Signed-off-by: Anand Jain <anand.jain@oracle.com> >> --- >> v1->v2: fix btrfs_info, using string directly. Add spacing. > >> fs/btrfs/scrub.c | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c >> index 6dcd36d7b849..aadafc3e52c7 100644 >> --- a/fs/btrfs/scrub.c >> +++ b/fs/btrfs/scrub.c >> @@ -3903,6 +3903,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, >> */ >> nofs_flag = memalloc_nofs_save(); >> if (!is_dev_replace) { >> + btrfs_info(fs_info, "scrub: devid %llu started", devid); >> /* >> * by holding device list mutex, we can >> * kick off writing super in log tree sync. >> @@ -3925,6 +3926,10 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, >> if (progress) >> memcpy(progress, &sctx->stat, sizeof(*progress)); >> >> + if (!is_dev_replace) >> + btrfs_info(fs_info, "scrub: devid %llu %s:%d", >> + devid, ret ? "not finished" : "finished", ret); > > I've checked how the balance status messages are formatted and unified > them so it's > > + btrfs_info(fs_info, "scrub: started on devid %llu", devid); > > and > > + btrfs_info(fs_info, "scrub: %s on devid %llu with status: %d", > + ret ? "not finished" : "finished", devid, ret); oh that's even better. Thanks David. > Patch added to misc-next, thanks.