From mboxrd@z Thu Jan  1 00:00:00 1970
From: Haicheng Li <haicheng.li@linux.intel.com>
Subject: Re: [PATCH 3/4] f2fs: optimize scan_nat_page()
Date: Wed, 8 May 2013 13:31:34 +0800
Message-ID: <20130508053134.GA8705@hli22-desktop>
References: <1367853344-28938-1-git-send-email-haicheng.li@linux.intel.com>
 <1367853344-28938-4-git-send-email-haicheng.li@linux.intel.com>
 <1367922988.16581.45.camel@kjgkr>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: linux-kernel@vger.kernel.org, Haicheng Li <haicheng.lee@gmail.com>,
	linux-fsdevel@vger.kernel.org,
	linux-f2fs-devel@lists.sourceforge.net
To: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <1367922988.16581.45.camel@kjgkr>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: linux-fsdevel.vger.kernel.org

On Tue, May 07, 2013 at 07:36:28PM +0900, Jaegeuk Kim wrote:
> Hi,
>=20
> 2013-05-06 (=EC=9B=94), 23:15 +0800, Haicheng Li:
> >  	if (nm_i->fcnt > 2 * MAX_FREE_NIDS)
> > -		return 0;
> > +		return -1;
>=20
> We should check all the handler of add_free_nid().
yes, sorry that I missed double checking it while rebasing this patch
from master to dev branch, since there is only one handler on the maste=
r branch.

> So, plz see the below modified patch.
> > +		if (blk_addr =3D=3D NULL_ADDR) {
> > +			cnt =3D add_free_nid(nm_i, start_nid);
> > +			if (cnt < 0)
> > +				break;
> > +		}
>=20
> Here we need to eliminate cnt.
sure, harmless & can reduce the code line.

and the below patch looks good to me. Thanks.
> -----
> From e2da02f0ba045f792d166ac8215d04474c06f319 Mon Sep 17 00:00:00 200=
1
> From: Haicheng Li <haicheng.li@linux.intel.com>
> Date: Mon, 6 May 2013 23:15:43 +0800
> Subject: [PATCH] f2fs: optimize scan_nat_page()
> Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
> linux-f2fs-devel@lists.sourceforge.net
>=20
> When nm_i->fcnt > 2 * MAX_FREE_NIDS, stop scanning other NAT entries.
>=20
> Signed-off-by: Haicheng Li <haicheng.li@linux.intel.com>
> [Jaegeuk Kim: fix handling the return value of add_free_nid()]
> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
> ---
>  fs/f2fs/node.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
>=20
> diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
> index 122200e..e42934e 100644
> --- a/fs/f2fs/node.c
> +++ b/fs/f2fs/node.c
> @@ -1254,7 +1254,7 @@ static int add_free_nid(struct f2fs_nm_info *nm=
_i,
> nid_t nid)
>  	struct free_nid *i;
> =20
>  	if (nm_i->fcnt > 2 * MAX_FREE_NIDS)
> -		return 0;
> +		return -1;
> =20
>  	/* 0 nid should not be used */
>  	if (nid =3D=3D 0)
> @@ -1302,12 +1302,16 @@ static void scan_nat_page(struct f2fs_nm_info
> *nm_i,
>  	i =3D start_nid % NAT_ENTRY_PER_BLOCK;
> =20
>  	for (; i < NAT_ENTRY_PER_BLOCK; i++, start_nid++) {
> +
>  		if (start_nid >=3D nm_i->max_nid)
>  			break;
> -		blk_addr  =3D le32_to_cpu(nat_blk->entries[i].block_addr);
> +
> +		blk_addr =3D le32_to_cpu(nat_blk->entries[i].block_addr);
>  		BUG_ON(blk_addr =3D=3D NEW_ADDR);
> -		if (blk_addr =3D=3D NULL_ADDR)
> -			add_free_nid(nm_i, start_nid);
> +		if (blk_addr =3D=3D NULL_ADDR) {
> +			if (add_free_nid(nm_i, start_nid) < 0)
> +				break;
> +		}
>  	}
>  }
> =20
> @@ -1655,7 +1659,7 @@ flush_now:
>  		}
> =20
>  		if (nat_get_blkaddr(ne) =3D=3D NULL_ADDR &&
> -					!add_free_nid(NM_I(sbi), nid)) {
> +				add_free_nid(NM_I(sbi), nid) <=3D 0) {
>  			write_lock(&nm_i->nat_tree_lock);
>  			__del_from_nat_cache(nm_i, ne);
>  			write_unlock(&nm_i->nat_tree_lock);
> --=20
> 1.8.1.3.566.gaa39828
>=20