Re: [ 131/184] ext4: make orphan functions be no-op in no-journal

[Ben Hutchings]

On Tue, 2013-06-04 at 19:23 +0200, Willy Tarreau wrote:
> 2.6.32-longterm review patch.  If anyone has any objections, please let me know.
> 
> ------------------
>  mode
> 
> From: Anatol Pomozov <anatol.pomozov@xxxxxxxxx>

commit c9b92530a723ac5ef8e352885a1862b18f31b2f5 upstream.

> 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@xxxxxxxxx>
> Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
> Signed-off-by: Willy Tarreau <w@xxxxxx>
> ---
>  fs/ext4/namei.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> index 828c9c9..230bef5 100644
> --- a/fs/ext4/namei.c
> +++ b/fs/ext4/namei.c
> @@ -2001,7 +2001,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);
> @@ -2082,8 +2082,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);
> @@ -2102,7 +2101,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);

-- 
Ben Hutchings
Theory and practice are closer in theory than in practice.
                                - John Levine, moderator of comp.compilers

Attachment: signature.asc
Description: This is a digitally signed message part