iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Btrfs: hardcode GFP_NOFS for btrfs_bio_clone_partial

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

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Liu Bo 2017-05-16 10:57:14 -07:00 committed by David Sterba
parent 3c91ee6964
commit e477094f0d
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/btrfs/extent_io.c
View File

@ -2721,14 +2721,13 @@ struct bio *btrfs_io_bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs)
return bio; return bio;
} }
struct bio *btrfs_bio_clone_partial(struct bio *orig, gfp_t gfp_mask, struct bio *btrfs_bio_clone_partial(struct bio *orig, int offset, int size)
int offset, int size)
{ {
struct bio *bio; struct bio *bio;
struct btrfs_io_bio *btrfs_bio; struct btrfs_io_bio *btrfs_bio;
/* this will never fail when it's backed by a bioset */ /* 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); ASSERT(bio);
btrfs_bio = btrfs_io_bio(bio); btrfs_bio = btrfs_io_bio(bio);

3
fs/btrfs/extent_io.h
View File

@ -467,8 +467,7 @@ btrfs_bio_alloc(struct block_device *bdev, u64 first_sector, int nr_vecs,
gfp_t gfp_flags); gfp_t gfp_flags);
struct bio *btrfs_io_bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs); 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, gfp_t gfp_mask);
struct bio *btrfs_bio_clone_partial(struct bio *orig, gfp_t gfp_mask, struct bio *btrfs_bio_clone_partial(struct bio *orig, int offset, int size);
int offset, int size);
struct btrfs_fs_info; struct btrfs_fs_info;
struct btrfs_inode; struct btrfs_inode;

2
fs/btrfs/inode.c
View File

@ -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 * This will never fail as it's passing GPF_NOFS and
* the allocation is backed by btrfs_bioset. * 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); clone_len);
bio->bi_private = dip; bio->bi_private = dip;
bio->bi_end_io = btrfs_end_dio_bio; bio->bi_end_io = btrfs_end_dio_bio;