From patchwork Mon Mar 9 21:19:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maciej_=C5=BBenczykowski?= X-Patchwork-Id: 448233 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5415C140157 for ; Tue, 10 Mar 2015 08:20:25 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=SOiB60KR; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753653AbbCIVUV (ORCPT ); Mon, 9 Mar 2015 17:20:21 -0400 Received: from mail-ig0-f170.google.com ([209.85.213.170]:40691 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751556AbbCIVUT (ORCPT ); Mon, 9 Mar 2015 17:20:19 -0400 Received: by igal13 with SMTP id l13so24937469iga.5 for ; Mon, 09 Mar 2015 14:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=NGwuX7C7KJgEAGy7eaE6KkYo08oabK2Nv27yTqJd1vY=; b=SOiB60KR54pWY3WEDWeQaljefbfIDmB3Q90syxKu664SPfMLZJ1WNb4sSMnYfUt4ZC kIJvGdJPFpLaLu2R/KHOCRgCmGBNelgU77Z/IzNTeoOSiIQ/iOQxMhcGacdx02sFdq0S TiSE810YWKg+gJz0qA7QFiLykqU/rGCtMRDvFnRC9zKZ70JexdCuaOi5AmozM+sbSGP6 KB48WPfXMgVZ5lM9mLNaFzBzC8Vhhb2AbBnYLRdxavkJb4L2RXpplKbudCLCDzQTs9ET 3sUam52PUd3ts6OidYFM6Y6B9utlq9AltKdytw04avxGfYT0BZOJeycUYr63rR7TWsv3 5w3Q== X-Received: by 10.107.7.18 with SMTP id 18mr26932809ioh.69.1425936018946; Mon, 09 Mar 2015 14:20:18 -0700 (PDT) Received: from sugar.mtv.corp.google.com ([172.18.110.190]) by mx.google.com with ESMTPSA id i16sm12839669ioe.17.2015.03.09.14.20.17 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Mar 2015 14:20:18 -0700 (PDT) From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= To: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , "David S. Miller" , Eric Dumazet Cc: Theodore Ts'o , netdev@vger.kernel.org Subject: [PATCH 1/8] net/socket: sock_map_fd - reverse error handling logic Date: Mon, 9 Mar 2015 14:19:56 -0700 Message-Id: <1425936003-24544-1-git-send-email-zenczykowski@gmail.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: References: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maciej Żenczykowski functional no-op, but easier to read Signed-off-by: Maciej Żenczykowski --- net/socket.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/socket.c b/net/socket.c index 95d3085cb477..323ebd530b88 100644 --- a/net/socket.c +++ b/net/socket.c @@ -397,13 +397,13 @@ static int sock_map_fd(struct socket *sock, int flags) return fd; newfile = sock_alloc_file(sock, flags, NULL); - if (likely(!IS_ERR(newfile))) { - fd_install(fd, newfile); - return fd; + if (unlikely(IS_ERR(newfile))) { + put_unused_fd(fd); + return PTR_ERR(newfile); } - put_unused_fd(fd); - return PTR_ERR(newfile); + fd_install(fd, newfile); + return fd; } struct socket *sock_from_file(struct file *file, int *err)