diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-27 20:30:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-27 20:30:46 +0100 |
| commit | 2002e90412df17ef7f714be62ed96a3c80b2f907 (patch) | |
| tree | 3dd03684f7436320ec64f9c702b5d057a25dca17 /fs/ext4/extents.c | |
| parent | 02a9547e9b3f10d73fde66f52fc8b2a375a300cd (diff) | |
| parent | 3b7ce99748f0d006f9d1aa85709872e7b46787f7 (diff) | |
| download | kernel_replicant_linux-2002e90412df17ef7f714be62ed96a3c80b2f907.tar.gz kernel_replicant_linux-2002e90412df17ef7f714be62ed96a3c80b2f907.tar.bz2 kernel_replicant_linux-2002e90412df17ef7f714be62ed96a3c80b2f907.zip | |
Merge branch 'topic/ics43432' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-gtm601
Diffstat (limited to 'fs/ext4/extents.c')
| -rw-r--r-- | fs/ext4/extents.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index aadb72828834..2553aa8b608d 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -504,7 +504,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); @@ -1089,7 +1089,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; @@ -1283,7 +1283,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); |