UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ext4: Use scoped memory API in mext_page_double_lock() 

Replace use of AOP_FLAG_NOFS with calls to memalloc_nofs_save()
and memalloc_nofs_restore().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-02-22 10:15:07 -05:00
parent 7333ed3587
commit 8f50c8b7ff
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/ext4/move_extent.c
View File

@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/quotaops.h>
#include <linux/slab.h>
#include <linux/sched/mm.h>
#include "ext4_jbd2.h"
#include "ext4.h"
#include "ext4_extents.h"
@ -127,7 +128,7 @@ mext_page_double_lock(struct inode *inode1, struct inode *inode2,
pgoff_t index1, pgoff_t index2, struct page *page[2])
{
struct address_space *mapping[2];
unsigned fl = AOP_FLAG_NOFS;
unsigned int flags;
BUG_ON(!inode1 || !inode2);
if (inode1 < inode2) {
@ -139,11 +140,15 @@ mext_page_double_lock(struct inode *inode1, struct inode *inode2,
mapping[1] = inode1->i_mapping;
}
page[0] = grab_cache_page_write_begin(mapping[0], index1, fl);
if (!page[0])
flags = memalloc_nofs_save();
page[0] = grab_cache_page_write_begin(mapping[0], index1, 0);
if (!page[0]) {
memalloc_nofs_restore(flags);
return -ENOMEM;
}
page[1] = grab_cache_page_write_begin(mapping[1], index2, fl);
page[1] = grab_cache_page_write_begin(mapping[1], index2, 0);
memalloc_nofs_restore(flags);
if (!page[1]) {
unlock_page(page[0]);
put_page(page[0]);