Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754538AbYAOT1H (ORCPT ); Tue, 15 Jan 2008 14:27:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751291AbYAOT04 (ORCPT ); Tue, 15 Jan 2008 14:26:56 -0500 Received: from wa-out-1112.google.com ([209.85.146.176]:46387 "EHLO wa-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751059AbYAOT0z (ORCPT ); Tue, 15 Jan 2008 14:26:55 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=OyPVOaTJgwsJCB+B73YmcWUuu6athRXamPicOrnNGRmKTjeC4Z6TIqgJ84xnKxvIrK0+v6ZbggPo9VeCbkT5ngXbb1GtHMdUjPobrkWXT08Dz7Ga+0cga1Ky2WvbW1oUI7xsMc/LN31u3SStRYNtDePKnrhOu25YE0/FIhHYnc0= Message-ID: <4df4ef0c0801151126p5dfdbc13ga9862c995890c33c@mail.gmail.com> Date: Tue, 15 Jan 2008 22:26:55 +0300 From: "Anton Salikhmetov" To: "Randy Dunlap" Subject: Re: [PATCH 1/2] Massive code cleanup of sys_msync() Cc: "Christoph Hellwig" , linux-mm@kvack.org, jakob@unthought.net, linux-kernel@vger.kernel.org, valdis.kletnieks@vt.edu, riel@redhat.com, ksm@42.dk, staubach@redhat.com, jesper.juhl@gmail.com, torvalds@linux-foundation.org, a.p.zijlstra@chello.nl, akpm@linux-foundation.org, protasnb@gmail.com, miklos@szeredi.hu In-Reply-To: <20080115111018.1e27a229.randy.dunlap@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <12004129652397-git-send-email-salikhmetov@gmail.com> <12004129734126-git-send-email-salikhmetov@gmail.com> <20080115175705.GA21557@infradead.org> <4df4ef0c0801151102l4d72b6b5j702e21beb1ebe459@mail.gmail.com> <20080115111018.1e27a229.randy.dunlap@oracle.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2657 Lines: 75 2008/1/15, Randy Dunlap : > On Tue, 15 Jan 2008 22:02:54 +0300 Anton Salikhmetov wrote: > > > 2008/1/15, Christoph Hellwig : > > > On Tue, Jan 15, 2008 at 07:02:44PM +0300, Anton Salikhmetov wrote: > > > > > @@ -33,71 +34,65 @@ asmlinkage long sys_msync(unsigned long start, size_t len, int flags) > > > > unsigned long end; > > > > struct mm_struct *mm = current->mm; > > > > struct vm_area_struct *vma; > > > > - int unmapped_error = 0; > > > > - int error = -EINVAL; > > > > + int error = 0, unmapped_error = 0; > > > > > > > > if (flags & ~(MS_ASYNC | MS_INVALIDATE | MS_SYNC)) > > > > - goto out; > > > > + return -EINVAL; > > > > if (start & ~PAGE_MASK) > > > > - goto out; > > > > + return -EINVAL; > > > > > > The goto out for a simple return style is used quite commonly in kernel > > > code to have a single return statement which makes code maintaince, e.g. > > > adding locks or allocations simpler. Not sure that getting rid of it > > > makes a lot of sense. > > > > Sorry, I can't agree. That's what is written in the CodingStyle document: > > > > The goto statement comes in handy when a function exits from multiple > > locations and some common work such as cleanup has to be done. > > CodingStyle does not try to cover Everything. Nor do we want it to. > > At any rate, there is a desire for functions to have a single point > of return, regardless of the amount of cleanup to be done, so I agree > with Christoph's comments. Should I replace "return -EINVAL;" statement with the following? { error = -EINVAL; goto out; } > > > > The second part of requirement does not hold true for the sys_msync() routine. > > > > > > > > > + file = vma->vm_file; > > > > + if ((flags & MS_SYNC) && file && (vma->vm_flags & VM_SHARED)) { > > > > > > Given that file is assigned just above it would be more readable to test > > > it first. > > > > The second part of my solution changes this code, anyway. > > > > > > > > > + if (error) > > > > + return error; > > > > > > This should be an goto out, returns out of the middle of the function > > > make reading and maintaining the code not so nice. > > > > Sorry, I don't think so. No "common cleanup" is needed here. > > > --- > ~Randy > -- 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/