From patchwork Wed Apr 24 17:18:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10915311 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 DCCA91708 for ; Wed, 24 Apr 2019 17:18:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C342D28A77 for ; Wed, 24 Apr 2019 17:18:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B72A128B36; Wed, 24 Apr 2019 17:18:15 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F1A028ABA for ; Wed, 24 Apr 2019 17:18:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EA286B0005; Wed, 24 Apr 2019 13:18:14 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 397CA6B0006; Wed, 24 Apr 2019 13:18:14 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2B0FD6B0007; Wed, 24 Apr 2019 13:18:14 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by kanga.kvack.org (Postfix) with ESMTP id 0D64F6B0005 for ; Wed, 24 Apr 2019 13:18:14 -0400 (EDT) Received: by mail-qt1-f198.google.com with SMTP id o16so5307774qtp.18 for ; Wed, 24 Apr 2019 10:18:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; bh=8PN4q84qh1f9OH8MwcxBKyw+Qn2Lh6fcIVoT1N4C0nQ=; b=PQnMt3Ql+PHIGBdFq+xtSqhOfmbrJH8KnPKkRGTnKI64vltRPc8s1pAI28JoBJDfHY T89dZEFOALt36WsbAIo0GZ1EVqeD39FAHCIZCwLdWtSV4QhCyHaAvCTP7yHYlXzDVUw8 rqor0phLyb6pytNu1Cb7Sfk4uatROoYPp0ra7AkT3w4+KxyajmSC3f1JK3atGmQknxfo u0WrDJF+3VtiGRg1raCP1G5fH5T5DGIQFm/HKBoGviCLlfPfqAZiEPoZdMw9VcGR7+CJ m84GG17dqlVR1BUg2/NNqIi4Tumj5cWIi5Y/u9RZM2OyeCm+7SvwUKW0WPsWHVNXbPMo w8Yw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APjAAAUumNWJteDL/GZeAjPOgVzdom1i7+XafNcSOAe4dqhrucxl5DoW wLdoPJ9Wjkp/gBB9Khoji3cMZ1h1ayQfgrSLJOqTLmpSNxOyGnzCRZrMcsoyWr1yQRrc3161rUl DY3t5uAAdxTzWUL2N7DLZdmM1N4xyevOBZjG3/Agd3l1sUrQBvVICc/6EGTCfCFp3tA== X-Received: by 2002:a37:5b86:: with SMTP id p128mr19425715qkb.10.1556126293807; Wed, 24 Apr 2019 10:18:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqyTMvmZCecso3Jqtdf2ufM0GrD3fnSfFlxn+S0uOE3r4xCNz+La5IX/ORO8TW41/f0VxFqQ X-Received: by 2002:a37:5b86:: with SMTP id p128mr19425658qkb.10.1556126293044; Wed, 24 Apr 2019 10:18:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556126293; cv=none; d=google.com; s=arc-20160816; b=TEBKW1rc3c3tNtOEol9KWEcJGSEtp7mcT5qKHSLFhf+j0il70YJwGaU1pk4SmvyZwG P2jbG/IHd3MJNwgEpRwlFZqdHZRf0VhlYfB3k67X+7xVVt1XVAlZzOuqdWhM9pDfalB9 RIm6u51m/5gXoR4vv2yAC8Sq4WiuW1qRUDyN1XQNFmlD66vCqo6vLsRhF2gZ2GVqqxXM 5Me55IhY87j6PzvvJ+mLhIaEgFMxIE80jSEy57ztu9idjePrRgSwbdinYJu2cClFqhvr fpCTVb65sQ9uddyrnjkDd2fw2hxNATbjP7qEVEfN6JeapK87k+7q9crSVcaKX2KK2L2+ buCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=8PN4q84qh1f9OH8MwcxBKyw+Qn2Lh6fcIVoT1N4C0nQ=; b=GY2gSxsDW+q7XsHD9j/WbfVY1CQm37rFzAYb9KmGf4B9fKweqOxVYze5sf2g74cIMZ Hh+zQ607UJ2WoT4kBA9B+ntnA91kNcNDDcOxXe04+20Ugje5yrB5Ki/hMFrfGHAIHDTK 4gKQKsiNtza5TkxR+3Un6CNxg4bLr0CycOz8OagzojmIfMTtB0sPXKHlWpdyn5Eat+jA uimGuF5srZpoUE1fyKXU/8rOvbDffhL6/3coxb910QLjvilgPMBW8GA5JK3Il3gYs1tr RjWxmpNnYXCfhvLvIRWMOcgOPAWtyZgRJOktZdhE65R8lYe7htPFcEredQJKonUrIhyx UWfA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id l21si1698879qtb.379.2019.04.24.10.18.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 10:18:13 -0700 (PDT) Received-SPF: pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1C0093147DD8; Wed, 24 Apr 2019 17:18:12 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 164305C21E; Wed, 24 Apr 2019 17:18:06 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, Christoph Hellwig Cc: Bob Peterson , Jan Kara , Dave Chinner , Ross Lagerwall , Mark Syms , =?utf-8?b?RWR3aW4gVMO2csO2aw==?= , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Andreas Gruenbacher Subject: [PATCH 1/2] iomap: Add a page_prepare callback Date: Wed, 24 Apr 2019 19:18:03 +0200 Message-Id: <20190424171804.4305-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 24 Apr 2019 17:18:12 +0000 (UTC) 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: X-Virus-Scanned: ClamAV using ClamSMTP Add a page_prepare calback that's called before a page is written to. This will be used by gfs2 to start a transaction in page_prepare and end it in page_done. Other filesystems that implement data journaling will require the same kind of mechanism. Signed-off-by: Andreas Gruenbacher --- fs/iomap.c | 4 ++++ include/linux/iomap.h | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/fs/iomap.c b/fs/iomap.c index 97cb9d486a7d..abd9aa76dbd1 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -684,6 +684,10 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, status = __block_write_begin_int(page, pos, len, NULL, iomap); else status = __iomap_write_begin(inode, pos, len, page, iomap); + + if (likely(!status) && iomap->page_prepare) + status = iomap->page_prepare(inode, pos, len, page, iomap); + if (unlikely(status)) { unlock_page(page); put_page(page); diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 0fefb5455bda..0982f3e13e56 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -65,10 +65,13 @@ struct iomap { void *private; /* filesystem private */ /* - * Called when finished processing a page in the mapping returned in - * this iomap. At least for now this is only supported in the buffered - * write path. + * Called before / after processing a page in the mapping returned in + * this iomap. At least for now, this is only supported in the + * buffered write path. When page_prepare returns 0 for a page, + * page_done is called for that page as well. */ + int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len, + struct page *page, struct iomap *iomap); void (*page_done)(struct inode *inode, loff_t pos, unsigned copied, struct page *page, struct iomap *iomap); }; From patchwork Wed Apr 24 17:18:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 10915313 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 6A40E161F for ; Wed, 24 Apr 2019 17:18:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F5F928A77 for ; Wed, 24 Apr 2019 17:18:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43A3428B36; Wed, 24 Apr 2019 17:18:20 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EDE228A77 for ; Wed, 24 Apr 2019 17:18:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8CBD96B0006; Wed, 24 Apr 2019 13:18:17 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 87AD76B0007; Wed, 24 Apr 2019 13:18:17 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 792B06B0008; Wed, 24 Apr 2019 13:18:17 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by kanga.kvack.org (Postfix) with ESMTP id 575676B0006 for ; Wed, 24 Apr 2019 13:18:17 -0400 (EDT) Received: by mail-qk1-f198.google.com with SMTP id k8so9169365qkj.20 for ; Wed, 24 Apr 2019 10:18:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=68HiEkfymLbbZHCNEviiqRtKpeA2p/7NS7IuW6oVoWM=; b=F7ASbh1r4chhPiU6ClZ2ENqAburknfTFwOtGCxzFiIVHxzXwxCfoKD3YWcoAWKQy1H lwWmV+zIcwHrYbPO9U7hyeiaNokIH5IIxLPHQSKlJNhsAgU2A+iwJBGETIdqH7n6+lLD foDb3XmtnIGcpNY3SZJCagJJ+XJZpFlqkbYphduAKKIFnyDngfG+f36nbTKyPsTT+sRV Im3ay11bHR9wCA/R1dItg06I7j7WevJkJG26bs9owSF/iMXKcxWcLChqAOQCOiYCqMqW t1iXiUb5oyzqX4igF/wjCVPzmSDkE+2af7DhKSHNdYPuT/4xnbmTOJbwSmEycOOelUd+ 96CA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APjAAAUgS8k2WvTwYWScznLgTXlLKDfck0UG+5M9yclfGN9Df+iNU0ba yCmv7NQaObO1451f6JCaBE1S74b+mfjZgfz0CRav6179sbwQ5G7HLAnnU7+Plf0yUDKdDNuQjK4 slJptFEcLaD3rmqmnlUhE4dX8yTXuodtiLX8hMdcpw89g0p4y26KjWfMliJBTZFwAIQ== X-Received: by 2002:a05:620a:1244:: with SMTP id a4mr25418146qkl.282.1556126297118; Wed, 24 Apr 2019 10:18:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqzffeC9dYV2mQBNBp9XOeXJeFoIDrLdT4N5wxFS/62zRD6jBt6ZgJmUu4nJCiSH03H54cee X-Received: by 2002:a05:620a:1244:: with SMTP id a4mr25418081qkl.282.1556126296193; Wed, 24 Apr 2019 10:18:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556126296; cv=none; d=google.com; s=arc-20160816; b=AqEw8H3WGsMHO1cbxV78sUXiYjOC4PZvpNicM3a6HKVLHAbj6rd20kJ3XbJmizwQq1 rl1v7MRUSJLaMrYChNiH7fIXhGfxA2yn069g4F2Sqy3lzSvam9EGe00gpIcIk+ekDRO6 mXoyrFVUmuNsmE2fc+6AtWuJN1xdk1Xgu9wQnLNxXtYZ+laRtTertkfbMMa2+Z9F+TyS slXL22KyF3DxO5EpOTaxgd74NLhPx/0nlEhUtFjwwPZnxDgJZOFINYTZsiZGqtfUyhuJ Fe3lT5iZu9yAt93/tVWUsnVhAgVxhq9nDWgU4XNjRk2c+p+z4yOMQZcwxgyfIM3ZABKR K79A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=68HiEkfymLbbZHCNEviiqRtKpeA2p/7NS7IuW6oVoWM=; b=b8Pp+Qa6GixdpeKVMOBAMNhWacrTsTh8UU5fBrEYB6IMVgtuPcr/KAH9eq8qxNi+gq Z2WKeCMHydwbEDOFGOQLdgTYPuMhqirESpmWabMOsuXSs3V5h6tJjBZgxXycjB7ZjE7V V2C92whWTdjx7dsd0KO56/F18UJvWMGqjpNrXpNVRPaEbY0PeO3Wi8dPjzH/sjTw+2zs GvtTkTJtHsaulEeq/FItUeZ63iN9+KD3fewNBMhUhXJBhVRrRLmmkB3ywNqVsF4P3J4o 62otgC3LFJOiuGY8rZOEesQIbuNcMzPa4KDWVtX4NzmfRHtPQdkQIWG2LronnkK3k+Y8 VOBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id w14si10252740qvl.154.2019.04.24.10.18.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 10:18:16 -0700 (PDT) Received-SPF: pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of agruenba@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=agruenba@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F2DD43088D94; Wed, 24 Apr 2019 17:18:14 +0000 (UTC) Received: from max.home.com (unknown [10.40.205.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7403861D05; Wed, 24 Apr 2019 17:18:12 +0000 (UTC) From: Andreas Gruenbacher To: cluster-devel@redhat.com, Christoph Hellwig Cc: Bob Peterson , Jan Kara , Dave Chinner , Ross Lagerwall , Mark Syms , =?utf-8?b?RWR3aW4gVMO2csO2aw==?= , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Andreas Gruenbacher Subject: [PATCH 2/2] gfs2: Fix iomap write page reclaim deadlock Date: Wed, 24 Apr 2019 19:18:04 +0200 Message-Id: <20190424171804.4305-2-agruenba@redhat.com> In-Reply-To: <20190424171804.4305-1-agruenba@redhat.com> References: <20190424171804.4305-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 24 Apr 2019 17:18:15 +0000 (UTC) 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: X-Virus-Scanned: ClamAV using ClamSMTP Since commit 64bc06bb32ee ("gfs2: iomap buffered write support"), gfs2 is doing buffered writes by starting a transaction in iomap_begin, writing a range of pages, and ending that transaction in iomap_end. This approach suffers from two problems: (1) Any allocations necessary for the write are done in iomap_begin, so when the data aren't journaled, there is no need for keeping the transaction open until iomap_end. (2) Transactions keep the gfs2 log flush lock held. When iomap_file_buffered_write calls balance_dirty_pages, this can end up calling gfs2_write_inode, which will try to flush the log. This requires taking the log flush lock which is already held, resulting in a deadlock. Fix both of these issues by not keeping transactions open from iomap_begin to iomap_end. Instead, start a small transaction in page_prepare and end it in page_done when necessary. Reported-by: Edwin Török Fixes: 64bc06bb32ee ("gfs2: iomap buffered write support") Signed-off-by: Andreas Gruenbacher Signed-off-by: Bob Peterson --- fs/gfs2/aops.c | 14 +++++-- fs/gfs2/bmap.c | 99 ++++++++++++++++++++++++++++---------------------- 2 files changed, 65 insertions(+), 48 deletions(-) diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 05dd78f4b2b3..6210d4429d84 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -649,7 +649,7 @@ static int gfs2_readpages(struct file *file, struct address_space *mapping, */ void adjust_fs_space(struct inode *inode) { - struct gfs2_sbd *sdp = inode->i_sb->s_fs_info; + struct gfs2_sbd *sdp = GFS2_SB(inode); struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode); struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode); struct gfs2_statfs_change_host *m_sc = &sdp->sd_statfs_master; @@ -657,10 +657,13 @@ void adjust_fs_space(struct inode *inode) struct buffer_head *m_bh, *l_bh; u64 fs_total, new_free; + if (gfs2_trans_begin(sdp, 2 * RES_STATFS, 0) != 0) + return; + /* Total up the file system space, according to the latest rindex. */ fs_total = gfs2_ri_total(sdp); if (gfs2_meta_inode_buffer(m_ip, &m_bh) != 0) - return; + goto out; spin_lock(&sdp->sd_statfs_spin); gfs2_statfs_change_in(m_sc, m_bh->b_data + @@ -675,11 +678,14 @@ void adjust_fs_space(struct inode *inode) gfs2_statfs_change(sdp, new_free, new_free, 0); if (gfs2_meta_inode_buffer(l_ip, &l_bh) != 0) - goto out; + goto out2; update_statfs(sdp, m_bh, l_bh); brelse(l_bh); -out: +out2: brelse(m_bh); +out: + sdp->sd_rindex_uptodate = 0; + gfs2_trans_end(sdp); } /** diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 5da4ca9041c0..34543a4d4e4a 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -991,13 +991,25 @@ static void gfs2_write_unlock(struct inode *inode) gfs2_glock_dq_uninit(&ip->i_gh); } -static void gfs2_iomap_journaled_page_done(struct inode *inode, loff_t pos, - unsigned copied, struct page *page, - struct iomap *iomap) +static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos, + unsigned len, struct page *page, + struct iomap *iomap) +{ + struct gfs2_sbd *sdp = GFS2_SB(inode); + + return gfs2_trans_begin(sdp, RES_DINODE + (len >> inode->i_blkbits), 0); +} + +static void gfs2_iomap_page_done(struct inode *inode, loff_t pos, + unsigned copied, struct page *page, + struct iomap *iomap) { struct gfs2_inode *ip = GFS2_I(inode); + struct gfs2_sbd *sdp = GFS2_SB(inode); - gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied); + if (!gfs2_is_stuffed(ip)) + gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied); + gfs2_trans_end(sdp); } static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos, @@ -1052,32 +1064,48 @@ static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos, if (alloc_required) rblocks += gfs2_rg_blocks(ip, data_blocks + ind_blocks); - ret = gfs2_trans_begin(sdp, rblocks, iomap->length >> inode->i_blkbits); - if (ret) - goto out_trans_fail; + if (unstuff || iomap->type == IOMAP_HOLE) { + struct gfs2_trans *tr; - if (unstuff) { - ret = gfs2_unstuff_dinode(ip, NULL); + ret = gfs2_trans_begin(sdp, rblocks, + iomap->length >> inode->i_blkbits); if (ret) - goto out_trans_end; - release_metapath(mp); - ret = gfs2_iomap_get(inode, iomap->offset, iomap->length, - flags, iomap, mp); - if (ret) - goto out_trans_end; - } + goto out_trans_fail; - if (iomap->type == IOMAP_HOLE) { - ret = gfs2_iomap_alloc(inode, iomap, flags, mp); - if (ret) { - gfs2_trans_end(sdp); - gfs2_inplace_release(ip); - punch_hole(ip, iomap->offset, iomap->length); - goto out_qunlock; + if (unstuff) { + ret = gfs2_unstuff_dinode(ip, NULL); + if (ret) + goto out_trans_end; + release_metapath(mp); + ret = gfs2_iomap_get(inode, iomap->offset, + iomap->length, flags, iomap, mp); + if (ret) + goto out_trans_end; + } + + if (iomap->type == IOMAP_HOLE) { + ret = gfs2_iomap_alloc(inode, iomap, flags, mp); + if (ret) { + gfs2_trans_end(sdp); + gfs2_inplace_release(ip); + punch_hole(ip, iomap->offset, iomap->length); + goto out_qunlock; + } } + + tr = current->journal_info; + if (tr->tr_num_buf_new) + __mark_inode_dirty(inode, I_DIRTY_DATASYNC); + else + gfs2_trans_add_meta(ip->i_gl, mp->mp_bh[0]); + + gfs2_trans_end(sdp); + } + + if (gfs2_is_stuffed(ip) || gfs2_is_jdata(ip)) { + iomap->page_prepare = gfs2_iomap_page_prepare; + iomap->page_done = gfs2_iomap_page_done; } - if (!gfs2_is_stuffed(ip) && gfs2_is_jdata(ip)) - iomap->page_done = gfs2_iomap_journaled_page_done; return 0; out_trans_end: @@ -1116,10 +1144,6 @@ static int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length, iomap->type != IOMAP_MAPPED) ret = -ENOTBLK; } - if (!ret) { - get_bh(mp.mp_bh[0]); - iomap->private = mp.mp_bh[0]; - } release_metapath(&mp); trace_gfs2_iomap_end(ip, iomap, ret); return ret; @@ -1130,27 +1154,16 @@ static int gfs2_iomap_end(struct inode *inode, loff_t pos, loff_t length, { struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_sbd *sdp = GFS2_SB(inode); - struct gfs2_trans *tr = current->journal_info; - struct buffer_head *dibh = iomap->private; if ((flags & (IOMAP_WRITE | IOMAP_DIRECT)) != IOMAP_WRITE) goto out; - if (iomap->type != IOMAP_INLINE) { + if (!gfs2_is_stuffed(ip)) gfs2_ordered_add_inode(ip); - if (tr->tr_num_buf_new) - __mark_inode_dirty(inode, I_DIRTY_DATASYNC); - else - gfs2_trans_add_meta(ip->i_gl, dibh); - } - - if (inode == sdp->sd_rindex) { + if (inode == sdp->sd_rindex) adjust_fs_space(inode); - sdp->sd_rindex_uptodate = 0; - } - gfs2_trans_end(sdp); gfs2_inplace_release(ip); if (length != written && (iomap->flags & IOMAP_F_NEW)) { @@ -1170,8 +1183,6 @@ static int gfs2_iomap_end(struct inode *inode, loff_t pos, loff_t length, gfs2_write_unlock(inode); out: - if (dibh) - brelse(dibh); return 0; }