From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel•org>, Jan Kara <jack@suse•cz>
Cc: Eric Biggers <ebiggers@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the f2fs tree
Date: Fri, 27 Aug 2021 10:28:40 +1000 [thread overview]
Message-ID: <20210827102840.386cdf1b@canb.auug.org.au> (raw)
In-Reply-To: <20210723111119.6b2bf2ca@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2642 bytes --]
Hi all,
On Fri, 23 Jul 2021 11:11:19 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> After merging the f2fs tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> fs/f2fs/data.c: In function 'f2fs_write_failed':
> fs/f2fs/data.c:3144:27: error: 'mapping' undeclared (first use in this function)
> 3144 | filemap_invalidate_lock(mapping);
> | ^~~~~~~
>
> Caused by commit
>
> ceddc02b7613 ("f2fs: make f2fs_write_failed() take struct inode")
>
> interacting with commit
>
> edc6d01bad73 ("f2fs: Convert to using invalidate_lock")
>
> from the ext3 tree.
>
> I have applied the following merge fix patch.
>
This fix up patch is now:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 27 Aug 2021 10:10:01 +1000
Subject: [PATCH] fxup for "f2fs: Convert to using invalidate_lock"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
fs/f2fs/data.c | 4 ++--
fs/f2fs/file.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index b03ec36cce1c..0facb5eb0acb 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3260,12 +3260,12 @@ static void f2fs_write_failed(struct inode *inode, loff_t to)
/* In the fs-verity case, f2fs_end_enable_verity() does the truncate */
if (to > i_size && !f2fs_verity_in_progress(inode)) {
down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
- filemap_invalidate_lock(mapping);
+ filemap_invalidate_lock(inode->i_mapping);
truncate_pagecache(inode, i_size);
f2fs_truncate_blocks(inode, i_size, true);
- filemap_invalidate_unlock(mapping);
+ filemap_invalidate_unlock(inode->i_mapping);
up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
}
}
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 884a165e70eb..9c8ef33bd8d3 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1112,7 +1112,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
blk_end = (loff_t)pg_end << PAGE_SHIFT;
down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
- filemap_invalidate_lock(mapping);
+ filemap_invalidate_lock(inode->i_mapping);
truncate_pagecache_range(inode, blk_start, blk_end - 1);
@@ -1120,7 +1120,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
ret = f2fs_truncate_hole(inode, pg_start, pg_end);
f2fs_unlock_op(sbi);
- filemap_invalidate_unlock(mapping);
+ filemap_invalidate_unlock(inode->i_mapping);
up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
}
}
--
2.32.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-08-27 0:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 1:11 linux-next: build failure after merge of the f2fs tree Stephen Rothwell
2021-08-27 0:28 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-23 0:49 Stephen Rothwell
2021-07-11 3:08 ` Stephen Rothwell
2020-11-03 1:31 Stephen Rothwell
2020-11-03 1:35 ` Jaegeuk Kim
2019-05-02 0:53 Stephen Rothwell
2019-05-02 3:42 ` Jaegeuk Kim
2018-01-17 23:04 Stephen Rothwell
2014-11-05 0:58 Stephen Rothwell
2013-08-27 1:41 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210827102840.386cdf1b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ebiggers@google$(echo .)com \
--cc=jack@suse$(echo .)cz \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox