From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753440AbbDBING (ORCPT ); Thu, 2 Apr 2015 04:13:06 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:55131 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753319AbbDBIMP (ORCPT ); Thu, 2 Apr 2015 04:12:15 -0400 From: Markus Pargmann To: Jens Axboe Cc: linux-kernel@vger.kernel.org, nbd-general@lists.sourceforge.net, kernel@pengutronix.de, Markus Pargmann Subject: [PATCH 7/9] nbd: Remove fixme that was already fixed Date: Thu, 2 Apr 2015 10:11:39 +0200 Message-Id: <1427962301-17085-8-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427962301-17085-1-git-send-email-mpa@pengutronix.de> References: <1427962301-17085-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The mentioned problem is not present anymore. Signed-off-by: Markus Pargmann --- drivers/block/nbd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 217b570dd7a5..6e7a7b06efcb 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) { -- 2.1.4