system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-19 18:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: use GFP_KERNEL in btrfs_defrag_file

Browse source 
We can safely use GFP_KERNEL, the function is called from two contexts:

- ioctl handler, called directly, no locks taken
- cleaner thread, running all queued defrag work, outside of any locks

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-06-22 03:13:02 +02:00
parent 3ec8362111
commit 63e727ecd2
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/btrfs/ioctl.c
View file

@ -1277,7 +1277,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
* context
*/
if (!file) {
ra = kzalloc(sizeof(*ra), GFP_NOFS);
ra = kzalloc(sizeof(*ra), GFP_KERNEL);
if (!ra)
return -ENOMEM;
file_ra_state_init(ra, inode->i_mapping);
@ -1285,8 +1285,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
ra = &file->f_ra;
}
pages = kmalloc_array(max_cluster, sizeof(struct page *),
GFP_NOFS);
pages = kmalloc_array(max_cluster, sizeof(struct page *), GFP_KERNEL);
if (!pages) {
ret = -ENOMEM;
goto out_ra;