iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4: Use scoped memory APIs in ext4_write_begin()

Browse Source 
Instead of setting AOP_FLAG_NOFS, use memalloc_nofs_save() and
memalloc_nofs_restore() to prevent GFP_FS allocations recursing
into the filesystem with a journal already started.

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:36:28 -05:00
parent 36d116e99d
commit 832ee62d99
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/ext4/ext4.h
View File

@ -3591,7 +3591,6 @@ extern int ext4_readpage_inline(struct inode *inode, struct page *page);
extern int ext4_try_to_write_inline_data(struct address_space *mapping, extern int ext4_try_to_write_inline_data(struct address_space *mapping,
struct inode *inode, struct inode *inode,
loff_t pos, unsigned len, loff_t pos, unsigned len,
unsigned flags,
struct page **pagep); struct page **pagep);
extern int ext4_write_inline_data_end(struct inode *inode, extern int ext4_write_inline_data_end(struct inode *inode,
loff_t pos, unsigned len, loff_t pos, unsigned len,

21
fs/ext4/inline.c
View File

@ -527,13 +527,13 @@ int ext4_readpage_inline(struct inode *inode, struct page *page)
} }
static int ext4_convert_inline_data_to_extent(struct address_space *mapping, static int ext4_convert_inline_data_to_extent(struct address_space *mapping,
struct inode *inode, struct inode *inode)
unsigned flags)
{ {
int ret, needed_blocks, no_expand; int ret, needed_blocks, no_expand;
handle_t *handle = NULL; handle_t *handle = NULL;
int retries = 0, sem_held = 0; int retries = 0, sem_held = 0;
struct page *page = NULL; struct page *page = NULL;
unsigned int flags;
unsigned from, to; unsigned from, to;
struct ext4_iloc iloc; struct ext4_iloc iloc;
@ -562,9 +562,9 @@ retry:
/* We cannot recurse into the filesystem as the transaction is already /* We cannot recurse into the filesystem as the transaction is already
* started */ * started */
flags |= AOP_FLAG_NOFS; flags = memalloc_nofs_save();
page = grab_cache_page_write_begin(mapping, 0, 0);
page = grab_cache_page_write_begin(mapping, 0, flags); memalloc_nofs_restore(flags);
if (!page) { if (!page) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
@ -649,11 +649,11 @@ out:
int ext4_try_to_write_inline_data(struct address_space *mapping, int ext4_try_to_write_inline_data(struct address_space *mapping,
struct inode *inode, struct inode *inode,
loff_t pos, unsigned len, loff_t pos, unsigned len,
unsigned flags,
struct page **pagep) struct page **pagep)
{ {
int ret; int ret;
handle_t *handle; handle_t *handle;
unsigned int flags;
struct page *page; struct page *page;
struct ext4_iloc iloc; struct ext4_iloc iloc;
@ -691,9 +691,9 @@ int ext4_try_to_write_inline_data(struct address_space *mapping,
if (ret) if (ret)
goto out; goto out;
flags |= AOP_FLAG_NOFS; flags = memalloc_nofs_save();
page = grab_cache_page_write_begin(mapping, 0, 0);
page = grab_cache_page_write_begin(mapping, 0, flags); memalloc_nofs_restore(flags);
if (!page) { if (!page) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
@ -727,8 +727,7 @@ out:
brelse(iloc.bh); brelse(iloc.bh);
return ret; return ret;
convert: convert:
return ext4_convert_inline_data_to_extent(mapping, return ext4_convert_inline_data_to_extent(mapping, inode);
inode, flags);
} }
int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len, int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len,

2
fs/ext4/inode.c
View File

@ -1156,7 +1156,7 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping,
if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) { if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) {
ret = ext4_try_to_write_inline_data(mapping, inode, pos, len, ret = ext4_try_to_write_inline_data(mapping, inode, pos, len,
flags, pagep); pagep);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret == 1) if (ret == 1)