From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161416AbcFBP02 (ORCPT ); Thu, 2 Jun 2016 11:26:28 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33998 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161147AbcFBP0G (ORCPT ); Thu, 2 Jun 2016 11:26:06 -0400 From: "Pranay Kr. Srivastava" To: mpa@pengutronix.de, nbd-general@lists.sourceforge.net, linux-kernel@vger.kernel.org Cc: "Pranay Kr. Srivastava" Subject: [PATCH v2 2/5]nbd: cleanup nbd_set_socket Date: Thu, 2 Jun 2016 13:24:58 +0300 Message-Id: <1464863101-16805-3-git-send-email-pranjas@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1464863101-16805-1-git-send-email-pranjas@gmail.com> References: <3898019.JRqDjBPssX@adelgunde> <1464863101-16805-1-git-send-email-pranjas@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch 1) uses spin_lock instead of irq version. 2) removes the goto statement in case a socket is already assigned with simple if-else statement. Signed-off-by: Pranay Kr. Srivastava --- drivers/block/nbd.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 0339d40..da2b0a4 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -657,17 +657,14 @@ static int nbd_set_socket(struct nbd_device *nbd, struct socket *sock) { int ret = 0; - spin_lock_irq(&nbd->sock_lock); + spin_lock(&nbd->sock_lock); - if (nbd->sock) { + if (nbd->sock) ret = -EBUSY; - goto out; - } - - nbd->sock = sock; + else + nbd->sock = sock; -out: - spin_unlock_irq(&nbd->sock_lock); + spin_unlock(&nbd->sock_lock); return ret; } -- 2.6.2