From patchwork Fri Nov 16 08:10:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10685641 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 61FC53CF1 for ; Fri, 16 Nov 2018 08:10:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 566BB2D35B for ; Fri, 16 Nov 2018 08:10:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4ABC02D381; Fri, 16 Nov 2018 08:10:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E45FA2D37A for ; Fri, 16 Nov 2018 08:10:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727499AbeKPSVb (ORCPT ); Fri, 16 Nov 2018 13:21:31 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:44490 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727380AbeKPSVb (ORCPT ); Fri, 16 Nov 2018 13:21:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=MI1i0xQzqN3tr+cfBlxsGlOlMa1NqCtA/ZsCgRQ0/ns=; b=K3UMraWMZjpcC0IHdYspLEOfW4 TKv0Ll926cfRLxcq5ljMGrUZFRYfqGLN/S/keFox/nhhsQ0I/CCPswCeTZru2rDTi9jGKHCa+PF6j W2C0gYDQWH9sdWiQN7uuCTD28sn5qAq1wC3oETp937jlCOtOH5FOfokgNPhJ/h0RnZ4OtCYh3lFBy pzowgLNAc8lN8mAAhuMkQuHlAFu0y+pM7yr+bM7rmBUJhrwzdg4jqn0c3qppkzWb2wX5jR2GJqPl4 8JG9J1wFx5YUd+oCCiNbQjakjrXqcw6+jVG5q3D+cSAVhLRrW+9DRhq32tPrl+Xe19qcyzJO3XcjB kTKcvpcQ==; Received: from 089144201193.atnat0010.highway.a1.net ([89.144.201.193] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNZCf-0002bm-Pv; Fri, 16 Nov 2018 08:10:14 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Omar Sandoval , linux-block@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH 2/6] floppy: remove queue_lock around floppy_end_request Date: Fri, 16 Nov 2018 09:10:02 +0100 Message-Id: <20181116081006.5083-3-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181116081006.5083-1-hch@lst.de> References: <20181116081006.5083-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is nothing the queue_lock could protect inside floppy_end_request, so remove it. Signed-off-by: Christoph Hellwig Reviewed-by: Omar Sandoval --- drivers/block/floppy.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index eeb4be8d000b..218099dd8e44 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -2254,10 +2254,7 @@ static void request_done(int uptodate) if (block > _floppy->sect) DRS->maxtrack = 1; - /* unlock chained buffers */ - spin_lock_irqsave(&q->queue_lock, flags); floppy_end_request(req, 0); - spin_unlock_irqrestore(&q->queue_lock, flags); } else { if (rq_data_dir(req) == WRITE) { /* record write error information */ @@ -2269,9 +2266,7 @@ static void request_done(int uptodate) DRWE->last_error_sector = blk_rq_pos(req); DRWE->last_error_generation = DRS->generation; } - spin_lock_irqsave(&q->queue_lock, flags); floppy_end_request(req, BLK_STS_IOERR); - spin_unlock_irqrestore(&q->queue_lock, flags); } }