diff options
| author | David Sterba | 2017-06-12 17:29:41 +0200 |
|---|---|---|
| committer | David Sterba | 2017-06-19 18:26:04 +0200 |
| commit | c5e4c3d7503453832444475641988ffa02b88b6d (patch) | |
| tree | 31eecedf58d2ef195db606fefec63fbc5eaf1dfe /fs/btrfs/extent_io.c | |
| parent | btrfs: add helper to initialize the non-bio part of btrfs_io_bio (diff) | |
| download | kernel-qcow2-linux-c5e4c3d7503453832444475641988ffa02b88b6d.tar.gz kernel-qcow2-linux-c5e4c3d7503453832444475641988ffa02b88b6d.tar.xz kernel-qcow2-linux-c5e4c3d7503453832444475641988ffa02b88b6d.zip | |
btrfs: sink gfp parameter to btrfs_io_bio_alloc
We can hardcode GFP_NOFS to btrfs_io_bio_alloc, although it means we
change it back from GFP_KERNEL in scrub. I'd rather save a few stack
bytes from not passing the gfp flags in the remaining, more imporatant,
contexts and the bio allocating API now looks more consistent.
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index cbd0a9a1daa5..29a6111a68d2 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -1987,7 +1987,7 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start, ASSERT(!(fs_info->sb->s_flags & MS_RDONLY)); BUG_ON(!mirror_num); - bio = btrfs_io_bio_alloc(GFP_NOFS, 1); + bio = btrfs_io_bio_alloc(1); bio->bi_iter.bi_size = 0; map_length = length; @@ -2331,7 +2331,7 @@ struct bio *btrfs_create_repair_bio(struct inode *inode, struct bio *failed_bio, struct btrfs_io_bio *btrfs_failed_bio; struct btrfs_io_bio *btrfs_bio; - bio = btrfs_io_bio_alloc(GFP_NOFS, 1); + bio = btrfs_io_bio_alloc(1); bio->bi_end_io = endio_func; bio->bi_iter.bi_sector = failrec->logical >> 9; bio->bi_bdev = fs_info->fs_devices->latest_bdev; @@ -2692,12 +2692,12 @@ struct bio *btrfs_bio_clone(struct bio *bio) return new; } -struct bio *btrfs_io_bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs) +struct bio *btrfs_io_bio_alloc(unsigned int nr_iovecs) { struct bio *bio; /* Bio allocation backed by a bioset does not fail */ - bio = bio_alloc_bioset(gfp_mask, nr_iovecs, btrfs_bioset); + bio = bio_alloc_bioset(GFP_NOFS, nr_iovecs, btrfs_bioset); btrfs_io_bio_init(btrfs_io_bio(bio)); return bio; } |