From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D995AC2F3A0 for ; Mon, 21 Jan 2019 14:12:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A072C20861 for ; Mon, 21 Jan 2019 14:12:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548079944; bh=6evxaf530AXuZaDfG+bvDZ6RyA2vTHaNW5in2CuqTI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2b75qayLqZ0hvELIxF9NHEh4iFs4eCyjvqITER+N+xDCgvPgWiwjnwdrXFiJTNJba dZmc4OOpJGaGmxFAQBOE9aTYFnrHcFyvqEWXFpAs/e5QtM6Dyfu+z65XN/PmV++VCK 2IBRmII0uv4d84CwKNKYjvNv7nIYKKXoXoEJmfkc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731323AbfAUNxp (ORCPT ); Mon, 21 Jan 2019 08:53:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:37600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730610AbfAUNxm (ORCPT ); Mon, 21 Jan 2019 08:53:42 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 515DF2087F; Mon, 21 Jan 2019 13:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548078821; bh=6evxaf530AXuZaDfG+bvDZ6RyA2vTHaNW5in2CuqTI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BbTF+OK4wPn+8bYN3XmTUj8JIMn0QXV4u0YZr10Nu/yf6vxOCoqFChK+eO6g2gWfK t1YPFeI12Rm3cglR5HOWaFe7W3fcNZvT659jep0UJAul2fsnLc2/CK7ziucKI+kmQ+ 5/mFQhSPOZAZ8c/Aefn0RIU5qaZbslPP78XEq4iY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jan Kara , Jens Axboe Subject: [PATCH 4.14 55/59] loop: Fold __loop_release into loop_release Date: Mon, 21 Jan 2019 14:44:20 +0100 Message-Id: <20190121122503.189084734@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121122456.529172919@linuxfoundation.org> References: <20190121122456.529172919@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jan Kara commit 967d1dc144b50ad005e5eecdfadfbcfb399ffff6 upstream. __loop_release() has a single call site. Fold it there. This is currently not a huge win but it will make following replacement of loop_index_mutex more obvious. Signed-off-by: Jan Kara Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/block/loop.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1603,12 +1603,15 @@ out: return err; } -static void __lo_release(struct loop_device *lo) +static void lo_release(struct gendisk *disk, fmode_t mode) { + struct loop_device *lo; int err; + mutex_lock(&loop_index_mutex); + lo = disk->private_data; if (atomic_dec_return(&lo->lo_refcnt)) - return; + goto unlock_index; mutex_lock(&loop_ctl_mutex); if (lo->lo_flags & LO_FLAGS_AUTOCLEAR) { @@ -1618,7 +1621,7 @@ static void __lo_release(struct loop_dev */ err = loop_clr_fd(lo); if (!err) - return; + goto unlock_index; } else if (lo->lo_state == Lo_bound) { /* * Otherwise keep thread (if running) and config, @@ -1629,12 +1632,7 @@ static void __lo_release(struct loop_dev } mutex_unlock(&loop_ctl_mutex); -} - -static void lo_release(struct gendisk *disk, fmode_t mode) -{ - mutex_lock(&loop_index_mutex); - __lo_release(disk->private_data); +unlock_index: mutex_unlock(&loop_index_mutex); }