ext4: make orphan functions be no-op in no-journal mode (c9b92530) · Commits · 戴 / test

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 <anatol.pomozov@gmail.com> Signed-off-by:

"Theodore Ts'o" <tytso@mit.edu>

fs/ext4/namei.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -2369,7 +2369,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);
		@@ -2443,8 +2443,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);
		@@ -2463,7 +2462,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);

Admin message