From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751536AbcFXKKJ (ORCPT ); Fri, 24 Jun 2016 06:10:09 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:34609 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750988AbcFXKKG (ORCPT ); Fri, 24 Jun 2016 06:10:06 -0400 From: "Pranay Kr. Srivastava" To: mpa@pengutronix.de, nbd-general@lists.sourceforge.net, linux-kernel@vger.kernel.org, w@uter.be Cc: "Pranay Kr. Srivastava" Subject: [PATCH v3 2/3]nbd: cleanup nbd_set_socket Date: Fri, 24 Jun 2016 13:09:35 +0300 Message-Id: <1466762976-12648-3-git-send-email-pranjas@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1466762976-12648-1-git-send-email-pranjas@gmail.com> References: <1962682.lYRJ5o9hTF@adelgunde> <1466762976-12648-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 | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 586d946..9223b09 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -653,17 +653,12 @@ static int nbd_set_socket(struct nbd_device *nbd, struct socket *sock) { int ret = 0; - spin_lock_irq(&nbd->sock_lock); - - if (nbd->sock) { + spin_lock(&nbd->sock_lock); + if (nbd->sock) ret = -EBUSY; - goto out; - } - - nbd->sock = sock; - -out: - spin_unlock_irq(&nbd->sock_lock); + else + nbd->sock = sock; + spin_unlock(&nbd->sock_lock); return ret; } -- 1.9.1