From: Markus Pargmann <mpa@pengutronix.de>
Date: Thu, 2 Apr 2015 08:11:39 +0000 (+0200)
Subject: nbd: Remove fixme that was already fixed
X-Git-Tag: v4.1-rc1~105^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e018e7570c8b0f9f5a4bb0e1eff9b1e7f768f49b;p=karo-tx-linux.git

nbd: Remove fixme that was already fixed

The mentioned problem is not present anymore.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 9e553a753410..ef57e7d83aed 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -110,14 +110,11 @@ static void nbd_end_request(struct nbd_device *nbd, struct request *req)
 	spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
+/*
+ * Forcibly shutdown the socket causing all listeners to error
+ */
 static void sock_shutdown(struct nbd_device *nbd, int lock)
 {
-	/* Forcibly shutdown the socket causing all listeners
-	 * to error
-	 *
-	 * FIXME: This code is duplicated from sys_shutdown, but
-	 * there should be a more generic interface rather than
-	 * calling socket ops directly here */
 	if (lock)
 		mutex_lock(&nbd->tx_lock);
 	if (nbd->sock) {