]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ext4: fix journal ref count in move_extent_par_page
authorPeng Tao <bergwolf@gmail.com>
Tue, 11 Aug 2009 03:05:28 +0000 (23:05 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 14 Dec 2009 16:06:06 +0000 (08:06 -0800)
(cherry picked from commit 91cc219ad963731191247c5f2db4118be2bc341a)

move_extent_par_page calls a_ops->write_begin() to increase journal
handler's reference count. However, if either mext_replace_branches()
or ext4_get_block fails, the increased reference count isn't
decreased. This will cause a later attempt to umount of the fs to hang
forever. The patch addresses the issue by calling ext4_journal_stop()
if page is not NULL (which means a_ops->write_end() isn't invoked).

Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/ext4/move_extent.c

index bbf2dd9404dc8894bc2223facad70d7629946871..5821e0bee91702b15da6dd26b09cc1cc3bb42e49 100644 (file)
@@ -871,6 +871,7 @@ out:
                if (PageLocked(page))
                        unlock_page(page);
                page_cache_release(page);
+               ext4_journal_stop(handle);
        }
 out2:
        ext4_journal_stop(handle);