Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1434460

[PATCH v4 1/5]nbd: cleanup nbd_set_socket

Show all headers | View raw

From: "Pranay Kr. Srivastava" <pranaykumar.srivastava@cognizant.com>

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@gmail.com>
---
 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 56f7f5d..766c401 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -643,17 +643,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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 0/4] nbd: nbd fixes "Pranay Kr. Srivastava" <pranjas@gmail.com> - 2016-06-30 13:10 +0200
  [PATCH v4 1/5]nbd: cleanup nbd_set_socket "Pranay Kr. Srivastava" <pranjas@gmail.com> - 2016-06-30 13:10 +0200
    Re: [PATCH v4 1/5]nbd: cleanup nbd_set_socket Pranay Srivastava <pranjas@gmail.com> - 2016-07-07 17:00 +0200
      Re: [PATCH v4 1/5]nbd: cleanup nbd_set_socket Pranay Srivastava <pranjas@gmail.com> - 2016-07-09 09:40 +0200
  [PATCH v4 3/5]nbd: make nbd device wait for its users "Pranay Kr. Srivastava" <pranjas@gmail.com> - 2016-06-30 13:10 +0200
  [PATCH v4 4/5]nbd: use i_size_write to assign nbd device size "Pranay Kr. Srivastava" <pranjas@gmail.com> - 2016-06-30 13:10 +0200
  [PATCH v4 2/5]nbd: fix might_sleep warning on socket shutdown "Pranay Kr. Srivastava" <pranjas@gmail.com> - 2016-06-30 13:10 +0200
    Re: [PATCH v4 2/5]nbd: fix might_sleep warning on socket shutdown Pranay Srivastava <pranjas@gmail.com> - 2016-07-04 09:10 +0200

csiph-web