From patchwork Wed Apr 4 19:18:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 10323213 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5140C60467 for ; Wed, 4 Apr 2018 19:27:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41F7026E90 for ; Wed, 4 Apr 2018 19:27:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 355CF27CEE; Wed, 4 Apr 2018 19:27:45 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCAC726E90 for ; Wed, 4 Apr 2018 19:27:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752425AbeDDT1f (ORCPT ); Wed, 4 Apr 2018 15:27:35 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49394 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751874AbeDDTTR (ORCPT ); Wed, 4 Apr 2018 15:19:17 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F3C6740201A6; Wed, 4 Apr 2018 19:19:16 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-125-89.rdu2.redhat.com [10.10.125.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E2BF94584; Wed, 4 Apr 2018 19:19:16 +0000 (UTC) From: jglisse@redhat.com To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , "Theodore Ts'o" , Jan Kara , linux-ext4@vger.kernel.org, Alexander Viro Subject: [RFC PATCH 33/79] fs/journal: add struct super_block to jbd2_journal_forget() arguments. Date: Wed, 4 Apr 2018 15:18:07 -0400 Message-Id: <20180404191831.5378-18-jglisse@redhat.com> In-Reply-To: <20180404191831.5378-1-jglisse@redhat.com> References: <20180404191831.5378-1-jglisse@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 04 Apr 2018 19:19:17 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 04 Apr 2018 19:19:17 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jglisse@redhat.com' RCPT:'' Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jérôme Glisse For the holy crusade to stop relying on struct page mapping field, add struct super_block to jbd2_journal_forget() arguments. spatch --sp-file zemantic-010a.spatch --in-place --dir fs/ ---------------------------------------------------------------------- @exists@ expression E1, E2; identifier I; @@ struct super_block *I; ... -jbd2_journal_forget(E1, E2) +jbd2_journal_forget(E1, I, E2) @exists@ expression E1, E2; identifier F, I; @@ F(..., struct super_block *I, ...) { ... -jbd2_journal_forget(E1, E2) +jbd2_journal_forget(E1, I, E2) ... } @exists@ expression E1, E2; identifier I; @@ struct block_device *I; ... -jbd2_journal_forget(E1, E2) +jbd2_journal_forget(E1, I->bd_super, E2) @exists@ expression E1, E2; identifier F, I; @@ F(..., struct block_device *I, ...) { ... -jbd2_journal_forget(E1, E2) +jbd2_journal_forget(E1, I->bd_super, E2) ... } @exists@ expression E1, E2; identifier I; @@ struct inode *I; ... -jbd2_journal_forget(E1, E2) +jbd2_journal_forget(E1, I->i_sb, E2) @exists@ expression E1, E2; identifier F, I; @@ F(..., struct inode *I, ...) { ... -jbd2_journal_forget(E1, E2) +jbd2_journal_forget(E1, I->i_sb, E2) ... } ---------------------------------------------------------------------- Signed-off-by: Jérôme Glisse Cc: "Theodore Ts'o" Cc: Jan Kara Cc: linux-ext4@vger.kernel.org Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org --- fs/ext4/ext4_jbd2.c | 2 +- fs/jbd2/revoke.c | 2 +- fs/jbd2/transaction.c | 3 ++- include/linux/jbd2.h | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index 2d593201cf7a..0804d564b529 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c @@ -224,7 +224,7 @@ int __ext4_forget(const char *where, unsigned int line, handle_t *handle, (!is_metadata && !ext4_should_journal_data(inode))) { if (bh) { BUFFER_TRACE(bh, "call jbd2_journal_forget"); - err = jbd2_journal_forget(handle, bh); + err = jbd2_journal_forget(handle, inode->i_sb, bh); if (err) ext4_journal_abort_handle(where, line, __func__, bh, handle, err); diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index 696ef15ec942..b6e2fd52acd6 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c @@ -381,7 +381,7 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr, set_buffer_revokevalid(bh); if (bh_in) { BUFFER_TRACE(bh_in, "call jbd2_journal_forget"); - jbd2_journal_forget(handle, bh_in); + jbd2_journal_forget(handle, bdev->bd_super, bh_in); } else { BUFFER_TRACE(bh, "call brelse"); __brelse(bh); diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index ac311037d7a5..e8c50bb5822c 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -1482,7 +1482,8 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) * Allow this call even if the handle has aborted --- it may be part of * the caller's cleanup after an abort. */ -int jbd2_journal_forget (handle_t *handle, struct buffer_head *bh) +int jbd2_journal_forget (handle_t *handle, struct super_block *sb, + struct buffer_head *bh) { transaction_t *transaction = handle->h_transaction; journal_t *journal; diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index b708e5169d1d..d89749a179eb 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1358,7 +1358,8 @@ extern int jbd2_journal_get_undo_access(handle_t *, struct buffer_head *); void jbd2_journal_set_triggers(struct buffer_head *, struct jbd2_buffer_trigger_type *type); extern int jbd2_journal_dirty_metadata (handle_t *, struct buffer_head *); -extern int jbd2_journal_forget (handle_t *, struct buffer_head *); +extern int jbd2_journal_forget (handle_t *, struct super_block *sb, + struct buffer_head *); extern void journal_sync_buffer (struct buffer_head *); extern int jbd2_journal_invalidatepage(journal_t *, struct page *, unsigned int, unsigned int);