[Nbd] [PATCH v2 2/5]nbd: cleanup nbd_set_socket
- To: mpa@...1897..., nbd-general@lists.sourceforge.net, linux-kernel@...25...
- Cc: "Pranay Kr. Srivastava" <pranjas@...17...>
- Subject: [Nbd] [PATCH v2 2/5]nbd: cleanup nbd_set_socket
- From: "Pranay Kr. Srivastava" <pranjas@...17...>
- Date: Thu, 2 Jun 2016 13:24:58 +0300
- Message-id: <1464863101-16805-3-git-send-email-pranjas@...17...>
- In-reply-to: <1464863101-16805-1-git-send-email-pranjas@...17...>
- References: <3898019.JRqDjBPssX@...2153...> <1464863101-16805-1-git-send-email-pranjas@...17...>
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 <pranjas@...17...>
---
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
Reply to: