| Message ID | 1417518054-21733-2-git-send-email-dmonakhov@openvz.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Tue, Dec 02, 2014 at 03:00:52PM +0400, Dmitry Monakhov wrote: > ext4_da_convert_inline_data_to_extent() invokes grab_cache_page_write_begin(). > grab_cache_page_write_begin performs memory allocation, so fs-reentrance > should be prohibited because we are inside journal transaction. > > Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> Thanks, applied. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 3ea6269..efdcede 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -870,6 +870,12 @@ retry_journal: goto out_journal; } + /* + * We cannot recurse into the filesystem as the transaction + * is already started. + */ + flags |= AOP_FLAG_NOFS; + if (ret == -ENOSPC) { ret = ext4_da_convert_inline_data_to_extent(mapping, inode, @@ -882,11 +888,6 @@ retry_journal: goto out; } - /* - * We cannot recurse into the filesystem as the transaction - * is already started. - */ - flags |= AOP_FLAG_NOFS; page = grab_cache_page_write_begin(mapping, 0, flags); if (!page) {
ext4_da_convert_inline_data_to_extent() invokes grab_cache_page_write_begin(). grab_cache_page_write_begin performs memory allocation, so fs-reentrance should be prohibited because we are inside journal transaction. Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> --- fs/ext4/inline.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)