diff --git a/block/genhd.c b/block/genhd.c
index 9f42526..b6f1dee 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1199,14 +1199,14 @@ static int diskstats_show(struct seq_file
*seqf, void *v)
                           "%u %lu %lu %lu %u %u %u %u\n",
                           MAJOR(part_devt(hd)), MINOR(part_devt(hd)),
                           disk_name(gp, hd->partno, buf),
-                          part_stat_read(hd, ios[READ]),
-                          part_stat_read(hd, merges[READ]),
-                          part_stat_read(hd, sectors[READ]),
-                          jiffies_to_msecs(part_stat_read(hd, ticks[READ])),
-                          part_stat_read(hd, ios[WRITE]),
-                          part_stat_read(hd, merges[WRITE]),
-                          part_stat_read(hd, sectors[WRITE]),
-                          jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])),
+                          part_stat_read(hd, ios[STAT_READ]),
+                          part_stat_read(hd, merges[STAT_READ]),
+                          part_stat_read(hd, sectors[STAT_READ]),
+                          jiffies_to_msecs(part_stat_read(hd,
ticks[STAT_READ])),
+                          part_stat_read(hd, ios[STAT_WRITE]),
+                          part_stat_read(hd, merges[STAT_WRITE]),
+                          part_stat_read(hd, sectors[STAT_WRITE]),
+                          jiffies_to_msecs(part_stat_read(hd,
ticks[STAT_WRITE])),
                           part_in_flight(hd),
                           jiffies_to_msecs(part_stat_read(hd, io_ticks)),
                           jiffies_to_msecs(part_stat_read(hd, time_in_queue))
diff --git a/block/partition-generic.c b/block/partition-generic.c
index d7eb77e..15bf298 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -123,14 +123,14 @@ ssize_t part_stat_show(struct device *dev,
                "%8lu %8lu %8llu %8u "
                "%8u %8u %8u"
                "\n",
-               part_stat_read(p, ios[READ]),
-               part_stat_read(p, merges[READ]),
-               (unsigned long long)part_stat_read(p, sectors[READ]),
-               jiffies_to_msecs(part_stat_read(p, ticks[READ])),
-               part_stat_read(p, ios[WRITE]),
-               part_stat_read(p, merges[WRITE]),
-               (unsigned long long)part_stat_read(p, sectors[WRITE]),
-               jiffies_to_msecs(part_stat_read(p, ticks[WRITE])),
+               part_stat_read(p, ios[STAT_READ]),
+               part_stat_read(p, merges[STAT_READ]),
+               (unsigned long long)part_stat_read(p, sectors[STAT_READ]),
+               jiffies_to_msecs(part_stat_read(p, ticks[STAT_READ])),
+               part_stat_read(p, ios[STAT_WRITE]),
+               part_stat_read(p, merges[STAT_WRITE]),
+               (unsigned long long)part_stat_read(p, sectors[STAT_WRITE]),
+               jiffies_to_msecs(part_stat_read(p, ticks[STAT_WRITE])),
                part_in_flight(p),
                jiffies_to_msecs(part_stat_read(p, io_ticks)),
                jiffies_to_msecs(part_stat_read(p, time_in_queue)));
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 304c712..3e7f205 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3182,7 +3182,7 @@ static int ext4_fill_super(struct super_block
*sb, void *data, int silent)
        sbi->s_sb_block = sb_block;
        if (sb->s_bdev->bd_part)
                sbi->s_sectors_written_start =
-                       part_stat_read(sb->s_bdev->bd_part, sectors[1]);
+                       part_stat_read(sb->s_bdev->bd_part,
sectors[STAT_WRITE]);

        /* Cleanup superblock name */
        strreplace(sb->s_id, '/', '!');
@@ -4359,7 +4359,8 @@ static int ext4_commit_super(struct super_block
*sb, int sync)
        if (sb->s_bdev->bd_part)
                es->s_kbytes_written =
                        cpu_to_le64(EXT4_SB(sb)->s_kbytes_written +
-                           ((part_stat_read(sb->s_bdev->bd_part, sectors[1]) -
+                           ((part_stat_read(sb->s_bdev->bd_part,
+                                            sectors[STAT_WRITE]) -
                              EXT4_SB(sb)->s_sectors_written_start) >> 1));
        else
                es->s_kbytes_written =
diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c
index 1420a3c..10ad87e 100644
--- a/fs/ext4/sysfs.c
+++ b/fs/ext4/sysfs.c
@@ -55,7 +55,8 @@ static ssize_t session_write_kbytes_show(struct ext4_attr *a,
        if (!sb->s_bdev->bd_part)
                return snprintf(buf, PAGE_SIZE, "0\n");
        return snprintf(buf, PAGE_SIZE, "%lu\n",
-                       (part_stat_read(sb->s_bdev->bd_part, sectors[1]) -
+                       (part_stat_read(sb->s_bdev->bd_part,
+                                       sectors[STAT_WRITE]) -
                         sbi->s_sectors_written_start) >> 1);
 }
@@ -68,7 +69,8 @@ static ssize_t lifetime_write_kbytes_show(struct ext4_attr *a,
                return snprintf(buf, PAGE_SIZE, "0\n");
        return snprintf(buf, PAGE_SIZE, "%llu\n",
                        (unsigned long long)(sbi->s_kbytes_written +
-                       ((part_stat_read(sb->s_bdev->bd_part, sectors[1]) -
+                       ((part_stat_read(sb->s_bdev->bd_part,
+                                        sectors[STAT_WRITE]) -
                          EXT4_SB(sb)->s_sectors_written_start) >> 1)));
 }

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 7a4558d..2b29afa 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -808,7 +808,7 @@ struct f2fs_sb_info {
  * and the return value is in kbytes. s is of struct f2fs_sb_info.
  */
 #define BD_PART_WRITTEN(s)                                              \
-(((u64)part_stat_read(s->sb->s_bdev->bd_part, sectors[1]) -             \
+(((u64)part_stat_read(s->sb->s_bdev->bd_part, sectors[STAT_WRITE]) -    \
                s->sectors_written_start) >> 1)

 static inline void f2fs_update_time(struct f2fs_sb_info *sbi, int type)
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 006f87d..d5da3cc 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1464,7 +1464,8 @@ try_onemore:
        /* For write statistics */
        if (sb->s_bdev->bd_part)
                sbi->sectors_written_start =
-                       (u64)part_stat_read(sb->s_bdev->bd_part, sectors[1]);
+                       (u64)part_stat_read(sb->s_bdev->bd_part,
+                                           sectors[STAT_WRITE]);

        /* Read accumulated write IO statistics if exists */
        seg_i = CURSEG_I(sbi, CURSEG_HOT_NODE);
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index b73559a..19e809c 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -59,6 +59,9 @@ enum {
 #define DISK_MAX_PARTS                 256
 #define DISK_NAME_LEN                  32

+#define STAT_READ                      0
+#define STAT_WRITE                     1
+
 #include <linux/major.h>
 #include <linux/device.h>
 #include <linux/smp.h>
@@ -80,7 +83,7 @@ struct partition {
 } __attribute__((packed));

 struct disk_stats {
-       unsigned long sectors[2];       /* READs and WRITEs */
+       unsigned long sectors[2];       /* STAT_READs and STAT_WRITEs */
        unsigned long ios[2];
        unsigned long merges[2];
        unsigned long ticks[2];
@@ -382,8 +385,8 @@ static inline void free_part_stats(struct hd_struct *part)
 #endif /* CONFIG_SMP */

 #define part_stat_read_accum(part, field)                              \
-       (part_stat_read(part, field[0]) +                               \
-        part_stat_read(part, field[1]))
+       (part_stat_read(part, field[STAT_READ]) +                       \
+        part_stat_read(part, field[STAT_WRITE]))

 #define part_stat_add(cpu, part, field, addnd) do {                    \
        __part_stat_add((cpu), (part), field, addnd);                   \
