summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongli Zhang2019-02-22 15:10:19 +0100
committerGreg Kroah-Hartman2019-05-02 09:58:52 +0200
commit1832b1517c2ba593fa49ce0b0f3fb9497209c361 (patch)
tree8201f731c7b3fb1921d83f5158a97bb0b443a9d0
parenttipc: handle the err returned from cmd header function (diff)
downloadkernel-qcow2-linux-1832b1517c2ba593fa49ce0b0f3fb9497209c361.tar.gz
kernel-qcow2-linux-1832b1517c2ba593fa49ce0b0f3fb9497209c361.tar.xz
kernel-qcow2-linux-1832b1517c2ba593fa49ce0b0f3fb9497209c361.zip
loop: do not print warn message if partition scan is successful
[ Upstream commit 40853d6fc619a6fd3d3177c3973a2eac9b598a80 ] 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 <dongli.zhang@oracle.com> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/block/loop.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index a63da9e07341..f1e63eb7cbca 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1112,8 +1112,9 @@ out_unlock:
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;
}