diff options
| author | David Sterba <dsterba@suse.com> | 2016-04-26 17:54:39 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-04-29 05:01:47 -0400 |
| commit | 018ed4f788870fdf6e625d04aa287080bdc8a54f (patch) | |
| tree | 2af0a4249ccb8b2615e0e9d5dbe1271735b4843c | |
| parent | 7cd8c7527cb3ad3b397fecfa1bdc8eec9fa33dd8 (diff) | |
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, | |||
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start, | 301 | static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start, |
| 302 | u64 end, struct extent_state **cached_state, gfp_t mask) | 302 | u64 end, struct extent_state **cached_state) |
| 303 | { | 303 | { |
| 304 | return set_extent_bit(tree, start, end, | 304 | return set_extent_bit(tree, start, end, |
| 305 | EXTENT_DELALLOC | EXTENT_UPTODATE | EXTENT_DEFRAG, | 305 | EXTENT_DELALLOC | EXTENT_UPTODATE | EXTENT_DEFRAG, |
| 306 | NULL, cached_state, mask); | 306 | NULL, cached_state, GFP_NOFS); |
| 307 | } | 307 | } |
| 308 | 308 | ||
| 309 | static inline int set_extent_new(struct extent_io_tree *tree, u64 start, | 309 | 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: | |||
| 1228 | 1228 | ||
| 1229 | 1229 | ||
| 1230 | set_extent_defrag(&BTRFS_I(inode)->io_tree, page_start, page_end - 1, | 1230 | set_extent_defrag(&BTRFS_I(inode)->io_tree, page_start, page_end - 1, |
| 1231 | &cached_state, GFP_NOFS); | 1231 | &cached_state); |
| 1232 | 1232 | ||
| 1233 | unlock_extent_cached(&BTRFS_I(inode)->io_tree, | 1233 | unlock_extent_cached(&BTRFS_I(inode)->io_tree, |
| 1234 | page_start, page_end - 1, &cached_state, | 1234 | page_start, page_end - 1, &cached_state, |
