From: Anatol Pomozov Date: Tue, 18 Sep 2012 17:38:59 +0000 (-0400) Subject: UPSTREAM: ext4: make orphan functions be no-op in no-journal mode X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=56de6fae4110bbfd310d5f2b3bb7675abdbd2da1;p=people%2Faperard%2Flinux-chromebook.git UPSTREAM: ext4: make orphan functions be no-op in no-journal mode Instead of checking whether the handle is valid, we check if journal is enabled. This avoids taking the s_orphan_lock mutex in all cases when there is no journal in use, including the error paths where ext4_orphan_del() is called with a handle set to NULL. Signed-off-by: Anatol Pomozov Signed-off-by: "Theodore Ts'o" BUG=chromium-os:37768 TEST=link build, manual test with corrupted filesystem image (cherry picked from commit c9b92530a723ac5ef8e352885a1862b18f31b2f5) Change-Id: I408cdaaa8872435f530a063bc84c3ca602e01b18 Signed-off-by: Kees Cook Reviewed-on: https://gerrit.chromium.org/gerrit/41037 Reviewed-by: Olof Johansson --- diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 349d7b3671c86..99a6970414515 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1978,7 +1978,7 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode) struct ext4_iloc iloc; int err = 0, rc; - if (!ext4_handle_valid(handle)) + if (!EXT4_SB(sb)->s_journal) return 0; mutex_lock(&EXT4_SB(sb)->s_orphan_lock); @@ -2052,8 +2052,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) struct ext4_iloc iloc; int err = 0; - /* ext4_handle_valid() assumes a valid handle_t pointer */ - if (handle && !ext4_handle_valid(handle)) + if (!EXT4_SB(inode->i_sb)->s_journal) return 0; mutex_lock(&EXT4_SB(inode->i_sb)->s_orphan_lock); @@ -2072,7 +2071,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) * transaction handle with which to update the orphan list on * disk, but we still need to remove the inode from the linked * list in memory. */ - if (sbi->s_journal && !handle) + if (!handle) goto out; err = ext4_reserve_inode_write(handle, inode, &iloc);