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

Commit e477094f authored by Liu Bo's avatar Liu Bo Committed by David Sterba
Browse files

Btrfs: hardcode GFP_NOFS for btrfs_bio_clone_partial 



We only pass GFP_NOFS to btrfs_bio_clone_partial, so lets hardcode it.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3c91ee69

fs/btrfs/extent_io.c

+2 −3
Original line number Diff line number Diff line
@@ -2721,14 +2721,13 @@ struct bio *btrfs_io_bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs) 
	return bio;

}



struct bio *btrfs_bio_clone_partial(struct bio *orig, gfp_t gfp_mask,

				    int offset, int size)

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

{

	struct bio *bio;

	struct btrfs_io_bio *btrfs_bio;



	/* this will never fail when it's backed by a bioset */

	bio = bio_clone_fast(orig, gfp_mask, btrfs_bioset);

	bio = bio_clone_fast(orig, GFP_NOFS, btrfs_bioset);

	ASSERT(bio);



	btrfs_bio = btrfs_io_bio(bio);

fs/btrfs/extent_io.h

+1 −2
Original line number Diff line number Diff line
@@ -467,8 +467,7 @@ 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_partial(struct bio *orig, gfp_t gfp_mask,

				    int offset, int size);

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



struct btrfs_fs_info;

struct btrfs_inode;

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -8514,7 +8514,7 @@ static int btrfs_submit_direct_hook(struct btrfs_dio_private *dip, 
		 * This will never fail as it's passing GPF_NOFS and

		 * the allocation is backed by btrfs_bioset.

		 */

		bio = btrfs_bio_clone_partial(orig_bio, GFP_NOFS, clone_offset,

		bio = btrfs_bio_clone_partial(orig_bio, clone_offset,

					      clone_len);

		bio->bi_private = dip;

		bio->bi_end_io = btrfs_end_dio_bio;