diff options
| author | David Sterba <dsterba@suse.com> | 2017-06-02 17:48:13 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-06-19 18:26:03 +0200 |
| commit | 8b6c1d56f2f5094b14b22a226b798ca3d186c0e9 (patch) | |
| tree | cabbffcb5b517d7f26cc5c2e9a389e165a569a96 /fs | |
| parent | e4f56903863c793bc1d181f7f0b6244ea5753338 (diff) | |
| download | linux-stable-8b6c1d56f2f5094b14b22a226b798ca3d186c0e9.tar.gz linux-stable-8b6c1d56f2f5094b14b22a226b798ca3d186c0e9.tar.bz2 linux-stable-8b6c1d56f2f5094b14b22a226b798ca3d186c0e9.zip | |
btrfs: sink gfp parameter to btrfs_bio_clone
All callers pass GFP_NOFS.
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/extent_io.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/extent_io.h | 2 | ||||
| -rw-r--r-- | fs/btrfs/inode.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index bfcbe8f2818b..d60221103ff4 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -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; diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index e3512c5d8770..4fe643a5aeaf 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -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; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1fde50a430a9..96bbc836d071 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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) { diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index ea9912157a56..c10d75fb2202 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -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; |