Patchwork ext4: fix incorrect lock ordering for ext4_ext_migrate

login
register
mail settings
Submitter Dmitri Monakho
Date April 1, 2013, 7:31 a.m.
Message ID <1364801462-13120-1-git-send-email-dmonakhov@openvz.org>
Download mbox | patch
Permalink /patch/232674/
State Accepted
Headers show

Comments

Dmitri Monakho - April 1, 2013, 7:31 a.m.
existing locking ordering: journal-> i_data_sem, but
ext4_ext_migrate() grab locks in opposite order which may result
in deacklock.

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
 fs/ext4/extents.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
Theodore Ts'o - April 8, 2013, 5:01 p.m.
On Mon, Apr 01, 2013 at 11:31:02AM +0400, Dmitry Monakhov wrote:
> existing locking ordering: journal-> i_data_sem, but
> ext4_ext_migrate() grab locks in opposite order which may result
> in deacklock.

Applied, but....  s/ext4_ext_migrate/ext4_ind_migrate/g in the commit
description.

						- 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

Patch

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index e4a6844..1530cf4 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4627,6 +4627,10 @@  int ext4_ind_migrate(struct inode *inode)
 	    (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
 		return -EINVAL;
 
+	handle = ext4_journal_start(inode, EXT4_HT_MIGRATE, 1);
+	if (IS_ERR(handle))
+		return PTR_ERR(handle);
+
 	down_write(&EXT4_I(inode)->i_data_sem);
 	ret = ext4_ext_check_inode(inode);
 	if (ret)
@@ -4650,19 +4654,13 @@  int ext4_ind_migrate(struct inode *inode)
 		}
 	}
 
-	handle = ext4_journal_start(inode, EXT4_HT_MIGRATE, 1);
-	if (IS_ERR(handle)) {
-		ret = PTR_ERR(handle);
-		goto errout;
-	}
-
 	ext4_clear_inode_flag(inode, EXT4_INODE_EXTENTS);
 	memset(ei->i_data, 0, sizeof(ei->i_data));
 	for (i=0; i < len; i++)
 		ei->i_data[i] = cpu_to_le32(blk++);
 	ext4_mark_inode_dirty(handle, inode);
-	ext4_journal_stop(handle);
 errout:
+	ext4_journal_stop(handle);
 	up_write(&EXT4_I(inode)->i_data_sem);
 	return ret;
 }