1 files changed, 8 insertions, 4 deletions

diff --git a/block/genhd.c b/block/genhd.c
index a9ec910974c1..1a4916e01732 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -98,7 +98,7 @@ void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,
 
         if (flags & DISK_PITER_REVERSE)
                 piter->idx = ptbl->len - 1;
-        else if (flags & DISK_PITER_INCL_PART0)
+        else if (flags & (DISK_PITER_INCL_PART0 | DISK_PITER_INCL_EMPTY_PART0))
                 piter->idx = 0;
         else
                 piter->idx = 1;
@@ -134,7 +134,8 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter)
         /* determine iteration parameters */
         if (piter->flags & DISK_PITER_REVERSE) {
                 inc = -1;
-                if (piter->flags & DISK_PITER_INCL_PART0)
+                if (piter->flags & (DISK_PITER_INCL_PART0 |
+                                    DISK_PITER_INCL_EMPTY_PART0))
                         end = -1;
                 else
                         end = 0;
@@ -150,7 +151,10 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter)
                 part = rcu_dereference(ptbl->part[piter->idx]);
                 if (!part)
                         continue;
-                if (!(piter->flags & DISK_PITER_INCL_EMPTY) && !part->nr_sects)
+                if (!part->nr_sects &&
+                    !(piter->flags & DISK_PITER_INCL_EMPTY) &&
+                    !(piter->flags & DISK_PITER_INCL_EMPTY_PART0 &&
+                      piter->idx == 0))
                         continue;
 
                 get_device(part_to_dev(part));
@@ -1011,7 +1015,7 @@ static int diskstats_show(struct seq_file *seqf, void *v)
                                 "\n\n");
         */
  
-        disk_part_iter_init(&piter, gp, DISK_PITER_INCL_PART0);
+        disk_part_iter_init(&piter, gp, DISK_PITER_INCL_EMPTY_PART0);
         while ((hd = disk_part_iter_next(&piter))) {
                 cpu = part_stat_lock();
                 part_round_stats(cpu, hd);