Merge tag 'x86-asm-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-2.6-block.git] / fs / f2fs / segment.c

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 4c8836ded90fc253a593a8348fb8ab78cf9eab40..e1065ba702076131067091fe173b19edab41b5d1 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1971,9 +1971,15 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi,
                }
 
                if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING))) {
+                       unsigned int nofs_flags;
+                       int ret;
+
                        trace_f2fs_issue_reset_zone(bdev, blkstart);
-                       return blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,
-                                               sector, nr_sects, GFP_NOFS);
+                       nofs_flags = memalloc_nofs_save();
+                       ret = blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,
+                                               sector, nr_sects);
+                       memalloc_nofs_restore(nofs_flags);
+                       return ret;
                }
 
                __queue_zone_reset_cmd(sbi, bdev, blkstart, lblkstart, blklen);
@@ -4865,6 +4871,7 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
        block_t zone_block, valid_block_cnt;
        unsigned int log_sectors_per_block = sbi->log_blocksize - SECTOR_SHIFT;
        int ret;
+       unsigned int nofs_flags;
 
        if (zone->type != BLK_ZONE_TYPE_SEQWRITE_REQ)
                return 0;
@@ -4912,8 +4919,10 @@ static int check_zone_write_pointer(struct f2fs_sb_info *sbi,
                    "pointer: valid block[0x%x,0x%x] cond[0x%x]",
                    zone_segno, valid_block_cnt, zone->cond);
 
+       nofs_flags = memalloc_nofs_save();
        ret = blkdev_zone_mgmt(fdev->bdev, REQ_OP_ZONE_FINISH,
-                               zone->start, zone->len, GFP_NOFS);
+                               zone->start, zone->len);
+       memalloc_nofs_restore(nofs_flags);
        if (ret == -EOPNOTSUPP) {
                ret = blkdev_issue_zeroout(fdev->bdev, zone->wp,
                                        zone->len - (zone->wp - zone->start),