From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-btrfs-owner@vger.kernel.org>
Received: from mgwkm03.jp.fujitsu.com ([202.219.69.170]:41614 "EHLO
	mgwkm03.jp.fujitsu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752496AbbHSIU3 (ORCPT
	<rfc822;linux-btrfs@vger.kernel.org>);
	Wed, 19 Aug 2015 04:20:29 -0400
Received: from m3050.s.css.fujitsu.com (msm.b.css.fujitsu.com [10.134.21.208])
	by kw-mxq.gw.nic.fujitsu.com (Postfix) with ESMTP id 78AF5AC014F
	for <linux-btrfs@vger.kernel.org>; Wed, 19 Aug 2015 17:20:26 +0900 (JST)
Subject: Re: [PATCH] Btrfs: cleanup: remove unnecessary check before
 btrfs_free_path is called
To: Qu Wenruo <quwenruo@cn.fujitsu.com>, linux-btrfs@vger.kernel.org
References: <201508190555.AA00003@WIN-5MHF4RKU941.jp.fujitsu.com>
 <55D43169.3030008@cn.fujitsu.com>
From: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Message-ID: <55D43C3C.6070401@jp.fujitsu.com>
Date: Wed, 19 Aug 2015 17:20:12 +0900
MIME-Version: 1.0
In-Reply-To: <55D43169.3030008@cn.fujitsu.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Sender: linux-btrfs-owner@vger.kernel.org
List-ID: <linux-btrfs.vger.kernel.org>

On 2015/08/19 16:34, Qu Wenruo wrote:
> Tsutomu Itoh wrote on 2015/08/19 14:55 +0900:
>> We need not check path before btrfs_free_path() is called because
>> path is checked in btrfs_free_path().
>>
>> Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
>
> Reviewed-by: Qu Wenruo <quwenruo@cn.fujitsu.com>

Thanks for the review.

>
> BTW, did you check btrfs-progs for the such cleanup?

I will check btrfs-progs soon.

Thanks,
Tsutomu

>
> Thanks,
> Qu
>
>> ---
>>   fs/btrfs/dev-replace.c | 3 +--
>>   fs/btrfs/inode.c       | 3 +--
>>   fs/btrfs/tree-defrag.c | 3 +--
>>   3 files changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
>> index 564a7de..e54dd59 100644
>> --- a/fs/btrfs/dev-replace.c
>> +++ b/fs/btrfs/dev-replace.c
>> @@ -183,8 +183,7 @@ no_valid_dev_replace_entry_found:
>>       }
>>
>>   out:
>> -    if (path)
>> -        btrfs_free_path(path);
>> +    btrfs_free_path(path);
>>       return ret;
>>   }
>>
>> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
>> index e33dff3..21ba036 100644
>> --- a/fs/btrfs/inode.c
>> +++ b/fs/btrfs/inode.c
>> @@ -6876,8 +6876,7 @@ out:
>>
>>       trace_btrfs_get_extent(root, em);
>>
>> -    if (path)
>> -        btrfs_free_path(path);
>> +    btrfs_free_path(path);
>>       if (trans) {
>>           ret = btrfs_end_transaction(trans, root);
>>           if (!err)
>> diff --git a/fs/btrfs/tree-defrag.c b/fs/btrfs/tree-defrag.c
>> index a4b9c8b..f31db43 100644
>> --- a/fs/btrfs/tree-defrag.c
>> +++ b/fs/btrfs/tree-defrag.c
>> @@ -115,8 +115,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
>>           ret = -EAGAIN;
>>       }
>>   out:
>> -    if (path)
>> -        btrfs_free_path(path);
>> +    btrfs_free_path(path);
>>       if (ret == -EAGAIN) {
>>           if (root->defrag_max.objectid > root->defrag_progress.objectid)
>>               goto done;
>>