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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 9E019C33CB2 for ; Tue, 14 Jan 2020 16:12:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 610B92187F for ; Tue, 14 Jan 2020 16:12:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="oplgdNMp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 610B92187F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0C7028E000A; Tue, 14 Jan 2020 11:12:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 078988E0009; Tue, 14 Jan 2020 11:12:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5ACA8E000A; Tue, 14 Jan 2020 11:12:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0200.hostedemail.com [216.40.44.200]) by kanga.kvack.org (Postfix) with ESMTP id CE85A8E0003 for ; Tue, 14 Jan 2020 11:12:50 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id AF0DA181AC537 for ; Tue, 14 Jan 2020 16:12:50 +0000 (UTC) X-FDA: 76376733300.20.woman57_35e498a72e102 X-HE-Tag: woman57_35e498a72e102 X-Filterd-Recvd-Size: 4165 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf31.hostedemail.com (Postfix) with ESMTP for ; Tue, 14 Jan 2020 16:12:50 +0000 (UTC) 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=79c/IqiMprBaz8H+ADFYKQUEqd4rZzvM1P9wDVwg94s=; b=oplgdNMprg/V9W1Vc9mSW6qBSh ChGK0XTPuUo5pfag32IxC8sSxaBrkFyl0myFkYt5pYEyGDrjCOovd86lG6sDj5l1Dco9y642z5ofb N/SL8Ih0SiW0jUAC/rpbTkGHn1T03SY2d3AGw+aVATKAXqEDbHN/Dygi0lo5LHvV8raebRWT9GfJi DKIua/yP7vmAD/gBNERutRlhO3Wd2YpngZcwxHUuVlIJRVz7EivgPFTLE7wzC+rnD9dkkn1uiTVrE TSVhdz5wCPHNKFv3VsImok06/b6DKyqx29YHWXMa+eS2n363pcieQPrgHV03WpEDEzEpMmSeup9El slJllqmg==; Received: from [2001:4bb8:18c:4f54:fcbb:a92b:61e1:719] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1irOo2-00009S-As; Tue, 14 Jan 2020 16:12:38 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Waiman Long , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Will Deacon , Andrew Morton , linux-ext4@vger.kernel.org, cluster-devel@redhat.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 04/12] gfs2: move setting current->backing_dev_info Date: Tue, 14 Jan 2020 17:12:17 +0100 Message-Id: <20200114161225.309792-5-hch@lst.de> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114161225.309792-1-hch@lst.de> References: <20200114161225.309792-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 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Only set current->backing_dev_info just around the buffered write calls to prepare for the next fix. Signed-off-by: Christoph Hellwig --- fs/gfs2/file.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 9d58295ccf7a..21d032c4b077 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -867,18 +867,15 @@ static ssize_t gfs2_file_write_iter(struct kiocb *i= ocb, struct iov_iter *from) inode_lock(inode); ret =3D generic_write_checks(iocb, from); if (ret <=3D 0) - goto out; - - /* We can write back this queue in page reclaim */ - current->backing_dev_info =3D inode_to_bdi(inode); + goto out_unlock; =20 ret =3D file_remove_privs(file); if (ret) - goto out2; + goto out_unlock; =20 ret =3D file_update_time(file); if (ret) - goto out2; + goto out_unlock; =20 if (iocb->ki_flags & IOCB_DIRECT) { struct address_space *mapping =3D file->f_mapping; @@ -887,11 +884,13 @@ static ssize_t gfs2_file_write_iter(struct kiocb *i= ocb, struct iov_iter *from) =20 written =3D gfs2_file_direct_write(iocb, from); if (written < 0 || !iov_iter_count(from)) - goto out2; + goto out_unlock; =20 + current->backing_dev_info =3D inode_to_bdi(inode); ret =3D iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops); + current->backing_dev_info =3D NULL; if (unlikely(ret < 0)) - goto out2; + goto out_unlock; buffered =3D ret; =20 /* @@ -915,14 +914,14 @@ static ssize_t gfs2_file_write_iter(struct kiocb *i= ocb, struct iov_iter *from) */ } } else { + current->backing_dev_info =3D inode_to_bdi(inode); ret =3D iomap_file_buffered_write(iocb, from, &gfs2_iomap_ops); + current->backing_dev_info =3D NULL; if (likely(ret > 0)) iocb->ki_pos +=3D ret; } =20 -out2: - current->backing_dev_info =3D NULL; -out: +out_unlock: inode_unlock(inode); if (likely(ret > 0)) { /* Handle various SYNC-type writes */ --=20 2.24.1