From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail137.messagelabs.com (mail137.messagelabs.com [216.82.249.19]) by kanga.kvack.org (Postfix) with ESMTP id B59548D003E for ; Sat, 12 Feb 2011 13:49:46 -0500 (EST) Received: from unknown (HELO localhost.localdomain) (zcncxNmDysja2tXBptWToZWJlF6Wp6IuYnI=@[200.157.204.20]) (envelope-sender ) by smtp-01.mandic.com.br (qmail-ldap-1.03) with AES256-SHA encrypted SMTP for ; 12 Feb 2011 18:49:42 -0000 From: Cesar Eduardo Barros Subject: [PATCH 05/24] sys_swapon: simplify error return from swap_info allocation Date: Sat, 12 Feb 2011 16:49:06 -0200 Message-Id: <1297536565-8059-5-git-send-email-cesarb@cesarb.net> In-Reply-To: <4D56D5F9.8000609@cesarb.net> References: <4D56D5F9.8000609@cesarb.net> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: Cesar Eduardo Barros At this point in sys_swapon, there is nothing to free. Return directly instead of jumping to the cleanup block at the end of the function. Signed-off-by: Cesar Eduardo Barros --- mm/swapfile.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 837e40f..be728e3 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1918,10 +1918,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) return -EPERM; p = alloc_swap_info(); - if (IS_ERR(p)) { - error = PTR_ERR(p); - goto out; - } + if (IS_ERR(p)) + return PTR_ERR(p); name = getname(specialfile); error = PTR_ERR(name); -- 1.7.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org