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,USER_AGENT_GIT autolearn=ham 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 67FF7C2F3A0 for ; Mon, 21 Jan 2019 14:16:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 398DA20861 for ; Mon, 21 Jan 2019 14:16:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548080164; bh=aDmuTRdBaO+UXQJIudY8G39dCQLIA9VXDIF1IkCBaUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Jvr+XRNr0rJapOd2/GWU7VI70mWkcDMbGuyBjounVNRcMncWK+PKonjtSluFuzwDB GVfJvyasohGMeDfhKqpsZgO7kDluX0PaAK5Vram9aAU58Nozrn7NmETi8N2ITmdAt9 ktWf83AcIzZYxS5fuwRs+cP8TTOBPo321XHDA4no= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730761AbfAUNvW (ORCPT ); Mon, 21 Jan 2019 08:51:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:34230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729025AbfAUNvT (ORCPT ); Mon, 21 Jan 2019 08:51:19 -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 C7D422063F; Mon, 21 Jan 2019 13:51:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548078678; bh=aDmuTRdBaO+UXQJIudY8G39dCQLIA9VXDIF1IkCBaUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rq1m1c1vApUswWZ30WHnQxCxzzIpqEcKCvgCxOk29PNJFLf9CpFQZlf4taWy6nLD4 xxaQkKPsWoVSnG5Fq6nBBZeVsTJ9Pu73HOzFKPIN+YzxQ8KG0Ra3+6siqNVmBXhtLo xYK540u7fKV32Tcafy0omScXe0DN26L8mTLvKKVU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tetsuo Handa , Jan Kara , Jens Axboe Subject: [PATCH 4.20 093/111] block/loop: Dont grab "struct file" for vfs_getattr() operation. Date: Mon, 21 Jan 2019 14:43:27 +0100 Message-Id: <20190121122506.276273828@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121122455.819406896@linuxfoundation.org> References: <20190121122455.819406896@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tetsuo Handa commit b1ab5fa309e6c49e4e06270ec67dd7b3e9971d04 upstream. vfs_getattr() needs "struct path" rather than "struct file". Let's use path_get()/path_put() rather than get_file()/fput(). Signed-off-by: Tetsuo Handa Reviewed-by: Jan Kara Signed-off-by: Jan Kara Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/block/loop.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1204,7 +1204,7 @@ loop_set_status(struct loop_device *lo, static int loop_get_status(struct loop_device *lo, struct loop_info64 *info) { - struct file *file; + struct path path; struct kstat stat; int ret; @@ -1229,16 +1229,16 @@ loop_get_status(struct loop_device *lo, } /* Drop lo_ctl_mutex while we call into the filesystem. */ - file = get_file(lo->lo_backing_file); + path = lo->lo_backing_file->f_path; + path_get(&path); mutex_unlock(&lo->lo_ctl_mutex); - ret = vfs_getattr(&file->f_path, &stat, STATX_INO, - AT_STATX_SYNC_AS_STAT); + ret = vfs_getattr(&path, &stat, STATX_INO, AT_STATX_SYNC_AS_STAT); if (!ret) { info->lo_device = huge_encode_dev(stat.dev); info->lo_inode = stat.ino; info->lo_rdevice = huge_encode_dev(stat.rdev); } - fput(file); + path_put(&path); return ret; }