Scrub on multiple devices may report wrong status if scrub finishes early on one of them. Reported-by: Sandy McArthur Jr <sandymac@xxxxxxxxx> Signed-off-by: David Sterba <dsterba@xxxxxxx> --- cmds-scrub.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmds-scrub.c b/cmds-scrub.c index eb50d8a65708..06c2a306f3b2 100644 --- a/cmds-scrub.c +++ b/cmds-scrub.c @@ -1073,15 +1073,11 @@ static int is_scrub_running_in_kernel(int fd, memset(&sp, 0, sizeof(sp)); sp.scrub_args.devid = di_args[i].devid; ret = ioctl(fd, BTRFS_IOC_SCRUB_PROGRESS, &sp.scrub_args); - if (ret < 0 && errno == ENODEV) - continue; - if (ret < 0 && errno == ENOTCONN) - return 0; if (!ret) return 1; } - return 1; + return 0; } static const char * const cmd_scrub_start_usage[]; -- 2.1.3 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
