From: Dmitry Monakhov <dmonakhov@openvz.org>
Date: Tue, 2 Dec 2014 21:09:50 +0000 (-0500)
Subject: ext4: prevent fsreentrance deadlock for inline_data
X-Git-Tag: v3.19-rc1~109^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5cc28a9eaab21ce7ded7845b32e2eafc4bbeb175;p=karo-tx-linux.git

ext4: prevent fsreentrance deadlock for inline_data

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>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 3ea62695abce..efdcede40c22 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) {