Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b6c1d56 authored by David Sterba's avatar David Sterba
Browse files

btrfs: sink gfp parameter to btrfs_bio_clone 



All callers pass GFP_NOFS.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e4f56903

fs/btrfs/extent_io.c

+2 −2
Original line number Diff line number Diff line
@@ -2675,13 +2675,13 @@ btrfs_bio_alloc(struct block_device *bdev, u64 first_sector, int nr_vecs, 
	return bio;

}



struct bio *btrfs_bio_clone(struct bio *bio, gfp_t gfp_mask)

struct bio *btrfs_bio_clone(struct bio *bio)

{

	struct btrfs_io_bio *btrfs_bio;

	struct bio *new;



	/* Bio allocation backed by a bioset does not fail */

	new = bio_clone_fast(bio, gfp_mask, btrfs_bioset);

	new = bio_clone_fast(bio, GFP_NOFS, btrfs_bioset);

	btrfs_bio = btrfs_io_bio(new);

	btrfs_bio->csum = NULL;

	btrfs_bio->csum_allocated = NULL;

fs/btrfs/extent_io.h

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ struct bio * 
btrfs_bio_alloc(struct block_device *bdev, u64 first_sector, int nr_vecs,

		gfp_t gfp_flags);

struct bio *btrfs_io_bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs);

struct bio *btrfs_bio_clone(struct bio *bio, gfp_t gfp_mask);

struct bio *btrfs_bio_clone(struct bio *bio);

struct bio *btrfs_bio_clone_partial(struct bio *orig, int offset, int size);



struct btrfs_fs_info;

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -8583,7 +8583,7 @@ static void btrfs_submit_direct(struct bio *dio_bio, struct inode *inode, 


	skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;



	bio = btrfs_bio_clone(dio_bio, GFP_NOFS);

	bio = btrfs_bio_clone(dio_bio);



	dip = kzalloc(sizeof(*dip), GFP_NOFS);

	if (!dip) {

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -6256,7 +6256,7 @@ int btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio, 
		}



		if (dev_nr < total_devs - 1)

			bio = btrfs_bio_clone(first_bio, GFP_NOFS);

			bio = btrfs_bio_clone(first_bio);

		else

			bio = first_bio;