hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: use GFP_KERNEL in btrfs_defrag_file 

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 * context
*/ */
if (!file) { if (!file) {
ra = kzalloc(sizeof(*ra), GFP_NOFS); ra = kzalloc(sizeof(*ra), GFP_KERNEL);
if (!ra) if (!ra)
return -ENOMEM; return -ENOMEM;
file_ra_state_init(ra, inode->i_mapping); 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; ra = &file->f_ra;
} }
pages = kmalloc_array(max_cluster, sizeof(struct page *), pages = kmalloc_array(max_cluster, sizeof(struct page *), GFP_KERNEL);
GFP_NOFS);
if (!pages) { if (!pages) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_ra; goto out_ra;