1 files changed, 13 insertions, 2 deletions

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 0b6113ba3b79..1901137f4eca 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -153,7 +153,7 @@ static struct parsed_partitions *
 check_partition(struct gendisk *hd, struct block_device *bdev)
 {
         struct parsed_partitions *state;
-        int i, res;
+        int i, res, err;
 
         state = kmalloc(sizeof(struct parsed_partitions), GFP_KERNEL);
         if (!state)
@@ -165,13 +165,24 @@ check_partition(struct gendisk *hd, struct block_device *bdev)
                 sprintf(state->name, "p");
 
         state->limit = hd->minors;
-        i = res = 0;
+        i = res = err = 0;
         while (!res && check_part[i]) {
                 memset(&state->parts, 0, sizeof(state->parts));
                 res = check_part[i++](state, bdev);
+                if (res < 0) {
+                        /* We have hit an I/O error which we don't report now.
+                        * But record it, and let the others do their job.
+                        */
+                        err = res;
+                        res = 0;
+                }
+
         }
         if (res > 0)
                 return state;
+        if (!err)
+        /* The partition is unrecognized. So report I/O errors if there were any */
+                res = err;
         if (!res)
                 printk(" unknown partition table\n");
         else if (warn_no_part)