diff options
| author | David Sterba <dsterba@suse.com> | 2016-04-26 23:54:39 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-04-29 11:01:47 +0200 |
| commit | 018ed4f788870fdf6e625d04aa287080bdc8a54f (patch) | |
| tree | 2af0a4249ccb8b2615e0e9d5dbe1271735b4843c | |
| parent | 7cd8c7527cb3ad3b397fecfa1bdc8eec9fa33dd8 (diff) | |
| download | linux-stable-018ed4f788870fdf6e625d04aa287080bdc8a54f.tar.gz linux-stable-018ed4f788870fdf6e625d04aa287080bdc8a54f.tar.bz2 linux-stable-018ed4f788870fdf6e625d04aa287080bdc8a54f.zip | |
btrfs: sink gfp parameter to set_extent_defrag
Single caller passes GFP_NOFS.
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/extent_io.h | 4 | ||||
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index e99a6befdbf5..a1cf4b1dd290 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -299,11 +299,11 @@ static inline int set_extent_delalloc(struct extent_io_tree *tree, u64 start, } static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start, - u64 end, struct extent_state **cached_state, gfp_t mask) + u64 end, struct extent_state **cached_state) { return set_extent_bit(tree, start, end, EXTENT_DELALLOC | EXTENT_UPTODATE | EXTENT_DEFRAG, - NULL, cached_state, mask); + NULL, cached_state, GFP_NOFS); } static inline int set_extent_new(struct extent_io_tree *tree, u64 start, diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 5a23806ae418..72f48252a55d 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1228,7 +1228,7 @@ again: set_extent_defrag(&BTRFS_I(inode)->io_tree, page_start, page_end - 1, - &cached_state, GFP_NOFS); + &cached_state); unlock_extent_cached(&BTRFS_I(inode)->io_tree, page_start, page_end - 1, &cached_state, |