diff options
| author | David Sterba | 2016-02-26 15:38:28 +0100 |
|---|---|---|
| committer | David Sterba | 2016-02-26 15:38:28 +0100 |
| commit | e22b3d1fbe596c7feba6782dab2e11c7b99f1d90 (patch) | |
| tree | 50cfe9b71c227c8661b785ab3a0a5cab33ad8e3f /fs/btrfs/file.c | |
| parent | Merge branch 'chandan/prep-subpage-blocksize' into for-chris-4.6 (diff) | |
| parent | btrfs: switch to kcalloc in btrfs_cmp_data_prepare (diff) | |
| download | kernel-qcow2-linux-e22b3d1fbe596c7feba6782dab2e11c7b99f1d90.tar.gz kernel-qcow2-linux-e22b3d1fbe596c7feba6782dab2e11c7b99f1d90.tar.xz kernel-qcow2-linux-e22b3d1fbe596c7feba6782dab2e11c7b99f1d90.zip | |
Merge branch 'dev/gfp-flags' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 5a58e292bdad..2d9e4009c7e4 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2636,7 +2636,7 @@ static int add_falloc_range(struct list_head *head, u64 start, u64 len) return 0; } insert: - range = kmalloc(sizeof(*range), GFP_NOFS); + range = kmalloc(sizeof(*range), GFP_KERNEL); if (!range) return -ENOMEM; range->start = start; @@ -2737,7 +2737,7 @@ static long btrfs_fallocate(struct file *file, int mode, btrfs_put_ordered_extent(ordered); unlock_extent_cached(&BTRFS_I(inode)->io_tree, alloc_start, locked_end, - &cached_state, GFP_NOFS); + &cached_state, GFP_KERNEL); /* * we can't wait on the range with the transaction * running or with the extent lock held @@ -2831,7 +2831,7 @@ static long btrfs_fallocate(struct file *file, int mode, } out_unlock: unlock_extent_cached(&BTRFS_I(inode)->io_tree, alloc_start, locked_end, - &cached_state, GFP_NOFS); + &cached_state, GFP_KERNEL); out: /* * As we waited the extent range, the data_rsv_map must be empty |