| From 30d29b119ef01776e0a301444ab24defe8d8bef3 Mon Sep 17 00:00:00 2001 |
| From: Zheng Liu <wenqing.lz@taobao.com> |
| Date: Wed, 12 Feb 2014 11:48:31 -0500 |
| Subject: ext4: fix error paths in swap_inode_boot_loader() |
| |
| From: Zheng Liu <wenqing.lz@taobao.com> |
| |
| commit 30d29b119ef01776e0a301444ab24defe8d8bef3 upstream. |
| |
| In swap_inode_boot_loader() we forgot to release ->i_mutex and resume |
| unlocked dio for inode and inode_bl if there is an error starting the |
| journal handle. This commit fixes this issue. |
| |
| Reported-by: Ahmed Tamrawi <ahmedtamrawi@gmail.com> |
| Cc: Andreas Dilger <adilger.kernel@dilger.ca> |
| Cc: Dr. Tilmann Bubeck <t.bubeck@reinform.de> |
| Signed-off-by: Zheng Liu <wenqing.lz@taobao.com> |
| Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/ext4/ioctl.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/fs/ext4/ioctl.c |
| +++ b/fs/ext4/ioctl.c |
| @@ -144,7 +144,7 @@ static long swap_inode_boot_loader(struc |
| handle = ext4_journal_start(inode_bl, EXT4_HT_MOVE_EXTENTS, 2); |
| if (IS_ERR(handle)) { |
| err = -EINVAL; |
| - goto swap_boot_out; |
| + goto journal_err_out; |
| } |
| |
| /* Protect extent tree against block allocations via delalloc */ |
| @@ -202,6 +202,7 @@ static long swap_inode_boot_loader(struc |
| |
| ext4_double_up_write_data_sem(inode, inode_bl); |
| |
| +journal_err_out: |
| ext4_inode_resume_unlocked_dio(inode); |
| ext4_inode_resume_unlocked_dio(inode_bl); |
| |
