From 247c3d0a49e78a914ce0b5a8821023e085eb19f8 Mon Sep 17 00:00:00 2001 From: Dongli Zhang Date: Thu, 28 Mar 2019 17:26:13 +0800 Subject: [PATCH] loop: do not print warn message if partition scan is successful mainline inclusion from mainline-5.1-rc1 commit 40853d6fc619a6fd3d3177c3973a2eac9b598a80 category: bugfix bugzilla: 12073 CVE: NA --------------------------- Do not print warn message when the partition scan returns 0. Fixes: d57f3374ba48 ("loop: Move special partition reread handling in loop_clr_fd()") Signed-off-by: Dongli Zhang Reviewed-by: Jan Kara Signed-off-by: Jens Axboe Signed-off-by: Yufen Yu Reviewed-by: zhengbin Signed-off-by: Yang Yingliang --- drivers/block/loop.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 0c5aeab4d23a..06b39ed5af7c 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1116,8 +1116,9 @@ static int __loop_clr_fd(struct loop_device *lo, bool release) err = __blkdev_reread_part(bdev); else err = blkdev_reread_part(bdev); - pr_warn("%s: partition scan of loop%d failed (rc=%d)\n", - __func__, lo_number, err); + if (err) + pr_warn("%s: partition scan of loop%d failed (rc=%d)\n", + __func__, lo_number, err); /* Device is gone, no point in returning error */ err = 0; } -- GitLab