OSDN Git Service

btrfs: sink gfp_t parameter to alloc_scrub_sector
authorDavid Sterba <dsterba@suse.com>
Fri, 14 Oct 2022 14:00:55 +0000 (16:00 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 5 Dec 2022 17:00:43 +0000 (18:00 +0100)
All callers pas GFP_KERNEL as parameter so we can use it directly in
alloc_scrub_sector.

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/scrub.c

index 6e70cc3..3aed760 100644 (file)
@@ -297,7 +297,7 @@ static struct scrub_block *alloc_scrub_block(struct scrub_ctx *sctx,
  * Will also allocate new pages for @sblock if needed.
  */
 static struct scrub_sector *alloc_scrub_sector(struct scrub_block *sblock,
-                                              u64 logical, gfp_t gfp)
+                                              u64 logical)
 {
        const pgoff_t page_index = (logical - sblock->logical) >> PAGE_SHIFT;
        struct scrub_sector *ssector;
@@ -305,7 +305,7 @@ static struct scrub_sector *alloc_scrub_sector(struct scrub_block *sblock,
        /* We must never have scrub_block exceed U32_MAX in size. */
        ASSERT(logical - sblock->logical < U32_MAX);
 
-       ssector = kzalloc(sizeof(*ssector), gfp);
+       ssector = kzalloc(sizeof(*ssector), GFP_KERNEL);
        if (!ssector)
                return NULL;
 
@@ -313,7 +313,7 @@ static struct scrub_sector *alloc_scrub_sector(struct scrub_block *sblock,
        if (!sblock->pages[page_index]) {
                int ret;
 
-               sblock->pages[page_index] = alloc_page(gfp);
+               sblock->pages[page_index] = alloc_page(GFP_KERNEL);
                if (!sblock->pages[page_index]) {
                        kfree(ssector);
                        return NULL;
@@ -1516,7 +1516,7 @@ static int scrub_setup_recheck_block(struct scrub_block *original_sblock,
                        sblock = sblocks_for_recheck[mirror_index];
                        sblock->sctx = sctx;
 
-                       sector = alloc_scrub_sector(sblock, logical, GFP_KERNEL);
+                       sector = alloc_scrub_sector(sblock, logical);
                        if (!sector) {
                                spin_lock(&sctx->stat_lock);
                                sctx->stat.malloc_errors++;
@@ -2438,7 +2438,7 @@ static int scrub_sectors(struct scrub_ctx *sctx, u64 logical, u32 len,
                 */
                u32 l = min(sectorsize, len);
 
-               sector = alloc_scrub_sector(sblock, logical, GFP_KERNEL);
+               sector = alloc_scrub_sector(sblock, logical);
                if (!sector) {
                        spin_lock(&sctx->stat_lock);
                        sctx->stat.malloc_errors++;
@@ -2769,7 +2769,7 @@ static int scrub_sectors_for_parity(struct scrub_parity *sparity,
        for (index = 0; len > 0; index++) {
                struct scrub_sector *sector;
 
-               sector = alloc_scrub_sector(sblock, logical, GFP_KERNEL);
+               sector = alloc_scrub_sector(sblock, logical);
                if (!sector) {
                        spin_lock(&sctx->stat_lock);
                        sctx->stat.malloc_errors++;