ext4: avoid deadlocks in the writeback path by using sb_getblk_gfp
Switch ext4 to using sb_getblk_gfp with GFP_NOFS added to fix possible deadlocks in the page writeback path. Signed-off-by: Nikolay Borisov <kernel@kyup.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@vger.kernel.org
This commit is contained in:
parent
bd7ade3cd9
commit
c45653c341
1 changed files with 3 additions and 3 deletions
|
@ -503,7 +503,7 @@ __read_extent_tree_block(const char *function, unsigned int line,
|
|||
struct buffer_head *bh;
|
||||
int err;
|
||||
|
||||
bh = sb_getblk(inode->i_sb, pblk);
|
||||
bh = sb_getblk_gfp(inode->i_sb, pblk, __GFP_MOVABLE | GFP_NOFS);
|
||||
if (unlikely(!bh))
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
|
@ -1088,7 +1088,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
|
|||
err = -EIO;
|
||||
goto cleanup;
|
||||
}
|
||||
bh = sb_getblk(inode->i_sb, newblock);
|
||||
bh = sb_getblk_gfp(inode->i_sb, newblock, __GFP_MOVABLE | GFP_NOFS);
|
||||
if (unlikely(!bh)) {
|
||||
err = -ENOMEM;
|
||||
goto cleanup;
|
||||
|
@ -1282,7 +1282,7 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode,
|
|||
if (newblock == 0)
|
||||
return err;
|
||||
|
||||
bh = sb_getblk(inode->i_sb, newblock);
|
||||
bh = sb_getblk_gfp(inode->i_sb, newblock, __GFP_MOVABLE | GFP_NOFS);
|
||||
if (unlikely(!bh))
|
||||
return -ENOMEM;
|
||||
lock_buffer(bh);
|
||||
|
|
Loading…
Reference in a new issue