--- /dev/null
+From: Jan Kara <jack@suse.cz>
+References: fate#302681
+Subject: [PATCH 23/28] ocfs2: Mark system files as not subject to quota accounting
+Patch-mainline: 2.6.29?
+
+Mark system files as not subject to quota accounting. This prevents
+possible recursions into quota code and thus deadlocks.
+
+Signed-off-by: Jan Kara <jack@suse.cz>
+---
+ fs/ocfs2/inode.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/fs/ocfs2/inode.c
++++ b/fs/ocfs2/inode.c
+@@ -284,8 +284,10 @@ int ocfs2_populate_inode(struct inode *i
+
+ inode->i_nlink = le16_to_cpu(fe->i_links_count);
+
+- if (fe->i_flags & cpu_to_le32(OCFS2_SYSTEM_FL))
++ if (fe->i_flags & cpu_to_le32(OCFS2_SYSTEM_FL)) {
+ OCFS2_I(inode)->ip_flags |= OCFS2_INODE_SYSTEM_FILE;
++ inode->i_flags |= S_NOQUOTA;
++ }
+
+ if (fe->i_flags & cpu_to_le32(OCFS2_LOCAL_ALLOC_FL)) {
+ OCFS2_I(inode)->ip_flags |= OCFS2_INODE_BITMAP;