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 > > > > > > Signed-off-by: Gu Zheng <guz.fnst@xxxxxxxxxxxxxx> > > --- > > fs/aio.c | 8 ++++++-- > > 1 files changed, 6 insertions(+), 2 deletions(-) > > > > 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 = kcalloc(nr_pages, sizeof(struct page *), > > GFP_KERNEL); > > - if (!ctx->ring_pages) > > + if (!ctx->ring_pages) { > > + put_aio_ring_file(ctx); > > return -ENOMEM; > > + } > > } > > > > CC fs/aio.o > fs/aio.c: In function ‘aio_setup_ring’: > fs/aio.c:363:4: error: implicit declaration of function ‘put_aio_ring_file’ [-Werror=implicit-function-declaration] > put_aio_ring_file(ctx); > > > 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 > > Dave > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
