From: Fam Zheng <famz@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>,
"James E.J. Bottomley" <JBottomley@parallels.com>,
linux-scsi@vger.kernel.org, famz@redhat.com
Subject: [PATCH 1/3] block: Return error in rescan_partitions if revalidating disk failed
Date: Tue, 24 Mar 2015 18:16:13 +0800 [thread overview]
Message-ID: <1427192175-23802-2-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1427192175-23802-1-git-send-email-famz@redhat.com>
If the disk can't read capacity, we should return an error.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
block/partition-generic.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/partition-generic.c b/block/partition-generic.c
index 0d9e5f9..1e60d7d 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -427,11 +427,11 @@ rescan:
return res;
if (disk->fops->revalidate_disk)
- disk->fops->revalidate_disk(disk);
+ res = disk->fops->revalidate_disk(disk);
check_disk_size_change(disk, bdev);
bdev->bd_invalidated = 0;
- if (!get_capacity(disk) || !(state = check_partition(disk, bdev)))
- return 0;
+ if (res || !get_capacity(disk) || !(state = check_partition(disk, bdev)))
+ return res;
if (IS_ERR(state)) {
/*
* I/O error reading the partition table. If any
--
1.9.3
next prev parent reply other threads:[~2015-03-24 10:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-24 10:16 [PATCH 0/3] Fix return code for ioctl( BLKRRPART ) if device is down Fam Zheng
2015-03-24 10:16 ` Fam Zheng [this message]
2015-04-22 2:58 ` [PATCH 1/3] block: Return error in rescan_partitions if revalidating disk failed James Bottomley
2015-04-22 4:13 ` Fam Zheng
2015-03-24 10:16 ` [PATCH 2/3] sd: Return error in sd_revalidate_disk if read capacity failed Fam Zheng
2015-03-24 10:16 ` [PATCH 3/3] sd: Return -EIO " Fam Zheng
2015-03-24 10:34 ` [PATCH 0/3] Fix return code for ioctl( BLKRRPART ) if device is down Paolo Bonzini
2015-03-24 10:42 ` Fam Zheng
2015-04-16 5:05 ` Fam Zheng
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=1427192175-23802-2-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=JBottomley@parallels.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@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 NNTP newsgroup(s).