From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gu Zheng <guz.fnst@cn.fujitsu.com>
Subject: Re: [PATCH] aio: clean up aio ring in the fail path
Date: Thu, 05 Dec 2013 09:14:48 +0800
Message-ID: <529FD388.7030907@cn.fujitsu.com>
References: <529F019A.2040401@cn.fujitsu.com> <20131204145416.GA22438@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
To: Dave Jones <davej@redhat.com>, Benjamin <bcrl@kvack.org>,
	linux-aio@kvack.org, fsdevel <linux-fsdevel@vger.kernel.org>,
	linux-kernel <linux-kernel@vger.kernel.org>,
	Al Viro <viro@zeniv.linux.org.uk>, Kent <kmo@daterainc.com>,
	Kristian Nielsen <knielsen@knielsen-hq.org>
Return-path: <linux-fsdevel-owner@vger.kernel.org>
Received: from cn.fujitsu.com ([222.73.24.84]:10047 "EHLO song.cn.fujitsu.com"
	rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP
	id S1756359Ab3LEBVm convert rfc822-to-8bit (ORCPT
	<rfc822;linux-fsdevel@vger.kernel.org>);
	Wed, 4 Dec 2013 20:21:42 -0500
In-Reply-To: <20131204145416.GA22438@redhat.com>
Sender: linux-fsdevel-owner@vger.kernel.org
List-ID: <linux-fsdevel.vger.kernel.org>

Hi Dave,

On 12/04/2013 10:54 PM, Dave Jones wrote:

> On Wed, Dec 04, 2013 at 06:19:06PM +0800, Gu Zheng wrote:
>  > Clean up the aio ring file in the fail path of aio_setup_ring
>  > and ioctx_alloc. And maybe it can fix the GPF issue reported by
>  > Dave Jones:
>  > https://lkml.org/lkml/2013/11/25/898
>  >=20
>  >=20
>  > Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
>  > ---
>  >  fs/aio.c |    8 ++++++--
>  >  1 files changed, 6 insertions(+), 2 deletions(-)
>  >=20
>  > diff --git a/fs/aio.c b/fs/aio.c
>  > index 08159ed..6efb7f6 100644
>  > --- a/fs/aio.c
>  > +++ b/fs/aio.c
>  > @@ -367,8 +367,10 @@ static int aio_setup_ring(struct kioctx *ctx)
>  >  	if (nr_pages > AIO_RING_PAGES) {
>  >  		ctx->ring_pages =3D kcalloc(nr_pages, sizeof(struct page *),
>  >  					  GFP_KERNEL);
>  > -		if (!ctx->ring_pages)
>  > +		if (!ctx->ring_pages) {
>  > +			put_aio_ring_file(ctx);
>  >  			return -ENOMEM;
>  > +		}
>  >  	}
>  > =20
>=20
>   CC      fs/aio.o
> fs/aio.c: In function =E2=80=98aio_setup_ring=E2=80=99:
> fs/aio.c:363:4: error: implicit declaration of function =E2=80=98put_=
aio_ring_file=E2=80=99 [-Werror=3Dimplicit-function-declaration]
>     put_aio_ring_file(ctx);
>=20
>=20
> Is this dependant on another patch ?

It's applied on 3.12-rc2. Please ignore the previous defective patch I =
sent
before, and try again.

Regards,
Gu

>=20
> 	Dave
>=20
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kerne=
l" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>=20


--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel=
" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html