Received: by 10.192.165.156 with SMTP id m28csp1352991imm; Wed, 11 Apr 2018 17:55:40 -0700 (PDT) X-Google-Smtp-Source: AIpwx49Y4okRJcEVLo5FvRpsiQ+nw/VDXGCEUld3jdXNAwvU5uaQWsQd//M9U8u7EzN+Q4fks8x+ X-Received: by 10.101.97.130 with SMTP id c2mr5116521pgv.219.1523494540035; Wed, 11 Apr 2018 17:55:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523494540; cv=none; d=google.com; s=arc-20160816; b=cJiIW89xWNX9ATJtye4uy/NTaGDWdJZXlv9fLRHLMZOA1QeF+iGXLHl6hmcO0/9BkG TvDAhKISM5ycfYoPZYMKKyVDEWeiTj++GCu4E+zu12nG20M1HAB/wVvPOLrN85XhcrIU Qzj6N+i0lOKRWgMc11HkpDxiIIKEp0YZMGr/3hgLQa+q7lRhBQKElNIFrPtED/+QRSLi IacCy1RLc+uXtoyyErZtiIJ8zgzD33nxmX9PH9yHuPT3/dDHe+JRpQsK1GhWmhlHJBmU Yoy093sNV+XDs4+gTXAbXQrsurpgDyXclwK50xhCZdxVzZnN/WMZ78kz09LwO7MPwpZz PeIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:subject:from:references:in-reply-to :message-id:cc:to:arc-authentication-results; bh=UtlEhh2Ew2nkQlGgXwZ70GgGB6RaWEiTH5qBm4QYyCA=; b=x0hZ6WHu1vNvlDX12aJgi3WgTNFBYYmGo3uUd+gpKATikBdwsFrPcH+9FqT7/xlMHf I0ZQckPuU7JGYBmPa9UPL2W4f77ui3j5m2Nybyzx/ENvfTsrFnxquci7YPXAsGRBk+Cw 33OtVvspb2ISBHeu1x7ivja8JtHYmbLd/bKt2oYYo3QfRxpJ6EyA+HCxUlcxSs77JrSC HEVEI9lfnZBcuffRpKfrXTc+nA/bZJv1CmcFxKbWkqFyH8fwwXGJnbV2bHyyENvV5Y+b KR8t4DCzA7o9tsHYsmMpunXcGfTofp5Hydpw18lBzDJHRKJEYJNNGvvsmNZmLH2NgFwN K8MQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m6-v6si2242743pls.642.2018.04.11.17.55.03; Wed, 11 Apr 2018 17:55:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752918AbeDLAvd (ORCPT + 99 others); Wed, 11 Apr 2018 20:51:33 -0400 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:39810 "EHLO kvm5.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752509AbeDLAuQ (ORCPT ); Wed, 11 Apr 2018 20:50:16 -0400 Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id 70CA2299E1; Wed, 11 Apr 2018 20:50:14 -0400 (EDT) To: Geert Uytterhoeven Cc: Jens Axboe , Laurent Vivier , linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, stable@vger.kernel.org Message-Id: <71b97421bda9d3772d6238297b3c93ecd881309b.1523493475.git.fthain@telegraphics.com.au> In-Reply-To: References: From: Finn Thain Subject: [PATCH v2 05/10] block/swim: Remove extra put_disk() call from error path Date: Wed, 11 Apr 2018 20:50:14 -0400 (EDT) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Cc: Laurent Vivier Cc: Jens Axboe Cc: stable@vger.kernel.org # v4.14+ Fixes: 103db8b2dfa5 ("[PATCH] swim: stop sharing request queue across multiple gendisks") Tested-by: Stan Johnson Signed-off-by: Finn Thain Acked-by: Laurent Vivier Reviewed-by: Geert Uytterhoeven --- drivers/block/swim.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 2cdfc0db5966..0258a96e0c46 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -861,7 +861,6 @@ static int swim_floppy_init(struct swim_priv *swd) &swd->lock); if (!swd->unit[drive].disk->queue) { err = -ENOMEM; - put_disk(swd->unit[drive].disk); goto exit_put_disks; } blk_queue_bounce_limit(swd->unit[drive].disk->queue, -- 2.16.1