Commit d612a04d authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Ben Hutchings

ext4: avoid deadlocks in the writeback path by using sb_getblk_gfp

commit c45653c3 upstream.

Switch ext4 to using sb_getblk_gfp with GFP_NOFS added to fix possible
deadlocks in the page writeback path.
Signed-off-by: default avatarNikolay Borisov <kernel@kyup.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 786d7b3d
...@@ -700,7 +700,8 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block, ...@@ -700,7 +700,8 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block,
path[ppos].p_depth = i; path[ppos].p_depth = i;
path[ppos].p_ext = NULL; path[ppos].p_ext = NULL;
bh = sb_getblk(inode->i_sb, path[ppos].p_block); bh = sb_getblk_gfp(inode->i_sb, path[ppos].p_block,
__GFP_MOVABLE | GFP_NOFS);
if (unlikely(!bh)) { if (unlikely(!bh)) {
ret = -ENOMEM; ret = -ENOMEM;
goto err; goto err;
...@@ -905,7 +906,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode, ...@@ -905,7 +906,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
err = -EIO; err = -EIO;
goto cleanup; goto cleanup;
} }
bh = sb_getblk(inode->i_sb, newblock); bh = sb_getblk_gfp(inode->i_sb, newblock, __GFP_MOVABLE | GFP_NOFS);
if (!bh) { if (!bh) {
err = -ENOMEM; err = -ENOMEM;
goto cleanup; goto cleanup;
...@@ -1089,7 +1090,7 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode, ...@@ -1089,7 +1090,7 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode,
if (newblock == 0) if (newblock == 0)
return err; return err;
bh = sb_getblk(inode->i_sb, newblock); bh = sb_getblk_gfp(inode->i_sb, newblock, __GFP_MOVABLE | GFP_NOFS);
if (!bh) if (!bh)
return -ENOMEM; return -ENOMEM;
lock_buffer(bh); lock_buffer(bh);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment