Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / fs / btrfs / raid56.c

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 244d499..d8d268c 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1035,7 +1035,7 @@ static int alloc_rbio_pages(struct btrfs_raid_bio *rbio)
        for (i = 0; i < rbio->nr_pages; i++) {
                if (rbio->stripe_pages[i])
                        continue;
-               page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);
+               page = alloc_page(GFP_NOFS);
                if (!page)
                        return -ENOMEM;
                rbio->stripe_pages[i] = page;
@@ -1054,7 +1054,7 @@ static int alloc_rbio_parity_pages(struct btrfs_raid_bio *rbio)
        for (; i < rbio->nr_pages; i++) {
                if (rbio->stripe_pages[i])
                        continue;
-               page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);
+               page = alloc_page(GFP_NOFS);
                if (!page)
                        return -ENOMEM;
                rbio->stripe_pages[i] = page;
@@ -1636,10 +1636,10 @@ struct btrfs_plug_cb {
 static int plug_cmp(void *priv, const struct list_head *a,
                    const struct list_head *b)
 {
-       struct btrfs_raid_bio *ra = container_of(a, struct btrfs_raid_bio,
-                                                plug_list);
-       struct btrfs_raid_bio *rb = container_of(b, struct btrfs_raid_bio,
-                                                plug_list);
+       const struct btrfs_raid_bio *ra = container_of(a, struct btrfs_raid_bio,
+                                                      plug_list);
+       const struct btrfs_raid_bio *rb = container_of(b, struct btrfs_raid_bio,
+                                                      plug_list);
        u64 a_sector = ra->bio_list.head->bi_iter.bi_sector;
        u64 b_sector = rb->bio_list.head->bi_iter.bi_sector;
 
@@ -2300,7 +2300,7 @@ static int alloc_rbio_essential_pages(struct btrfs_raid_bio *rbio)
                        if (rbio->stripe_pages[index])
                                continue;
 
-                       page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);
+                       page = alloc_page(GFP_NOFS);
                        if (!page)
                                return -ENOMEM;
                        rbio->stripe_pages[index] = page;
@@ -2350,14 +2350,14 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio,
        if (!need_check)
                goto writeback;
 
-       p_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);
+       p_page = alloc_page(GFP_NOFS);
        if (!p_page)
                goto cleanup;
        SetPageUptodate(p_page);
 
        if (has_qstripe) {
                /* RAID6, allocate and map temp space for the Q stripe */
-               q_page = alloc_page(GFP_NOFS | __GFP_HIGHMEM);
+               q_page = alloc_page(GFP_NOFS);
                if (!q_page) {
                        __free_page(p_page);
                        goto cleanup;