Merge tag 'pm-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[deliverable/linux.git] / fs / hfsplus / part_tbl.c

diff --git a/fs/hfsplus/part_tbl.c b/fs/hfsplus/part_tbl.c
index eb355d81e2798343720051c19e9d5559142a68e1..63164ebc52fa14f56570984908e409d5d0a4ba69 100644 (file)
--- a/fs/hfsplus/part_tbl.c
+++ b/fs/hfsplus/part_tbl.c
@@ -112,7 +112,8 @@ static int hfs_parse_new_pmap(struct super_block *sb, void *buf,
                if ((u8 *)pm - (u8 *)buf >= buf_size) {
                        res = hfsplus_submit_bio(sb,
                                                 *part_start + HFS_PMAP_BLK + i,
-                                                buf, (void **)&pm, READ);
+                                                buf, (void **)&pm, REQ_OP_READ,
+                                                0);
                        if (res)
                                return res;
                }
@@ -136,7 +137,7 @@ int hfs_part_find(struct super_block *sb,
                return -ENOMEM;
 
        res = hfsplus_submit_bio(sb, *part_start + HFS_PMAP_BLK,
-                                buf, &data, READ);
+                                buf, &data, REQ_OP_READ, 0);
        if (res)
                goto out;