Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759349AbYFLB37 (ORCPT ); Wed, 11 Jun 2008 21:29:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754901AbYFLB3w (ORCPT ); Wed, 11 Jun 2008 21:29:52 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:46621 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754791AbYFLB3v (ORCPT ); Wed, 11 Jun 2008 21:29:51 -0400 Date: Wed, 11 Jun 2008 18:24:05 -0700 From: Andrew Morton To: "Serge E. Hallyn" Cc: lkml Subject: Re: [PATCH -mm] mm/shmem.c: ret can be used uninitialized Message-Id: <20080611182405.7516069d.akpm@linux-foundation.org> In-Reply-To: <20080611193729.GD13365@us.ibm.com> References: <20080611193729.GD13365@us.ibm.com> X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1841 Lines: 62 On Wed, 11 Jun 2008 14:37:29 -0500 "Serge E. Hallyn" wrote: > >From 6c4eb2ce2849308c4a745ec1f93001e5064a469c Mon Sep 17 00:00:00 2001 > From: Serge Hallyn > Date: Wed, 11 Jun 2008 11:20:28 -0500 > Subject: [PATCH -mm] mm/shmem.c: ret can be used uninitialized > > Make sure ret is defined before check at line 1408. > > Signed-off-by: Serge Hallyn > --- > mm/shmem.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index ad24be7..b326ff2 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1365,7 +1365,7 @@ repeat: > } > > if (!filepage) { > - int ret; > + int ret = 0; > > spin_unlock(&info->lock); > filepage = shmem_alloc_page(gfp, info, idx); Well yes. But it adds more text and uncommentedly adds an unnecessary initialisation. With a wee bit of thought we can _reduce_ the amount of text and not add unnecessary stuff? --- a/mm/shmem.c~memcg-remove-refcnt-from-page_cgroup-fix-2 +++ a/mm/shmem.c @@ -1396,7 +1396,8 @@ repeat: swap = *entry; shmem_swp_unmap(entry); } - if (error || swap.val) + ret = error || swap.val; + if (ret) mem_cgroup_uncharge_cache_page(filepage); else ret = add_to_page_cache_lru(filepage, mapping, @@ -1405,7 +1406,7 @@ repeat: * At add_to_page_cache_lru() failure, uncharge will * be done automatically. */ - if (error || swap.val || ret) { + if (ret) { spin_unlock(&info->lock); page_cache_release(filepage); shmem_unacct_blocks(info->flags, 1); _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" 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/