Browse files

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" <>


Change-Id: I734ccb8069fceb12b864e7b9dceb37e27ab94c61
  • Loading branch information...
anatol authored and andi34 committed Sep 18, 2012
1 parent 11ea4c2 commit 861a2c295698a35afb69e8c649252448fd7b26e2
Showing with 3 additions and 4 deletions.
  1. +3 −4 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;
@@ -2059,8 +2059,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 &&
!(EXT4_SB(inode->i_sb)->s_mount_state & EXT4_ORPHAN_FS))
return 0;
@@ -2080,7 +2079,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);

0 comments on commit 861a2c2

Please sign in to comment.