linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel.org>, Jan Kara <jack@suse.cz>
Cc: Chao Yu <chao@kernel.org>, Chao Yu <yuchao0@huawei.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the f2fs tree
Date: Wed, 23 Jun 2021 10:49:22 +1000	[thread overview]
Message-ID: <20210623104922.30a5a3fa@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1895 bytes --]

Hi all,

After merging the f2fs tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/f2fs/data.c: In function 'f2fs_migrate_blocks':
fs/f2fs/data.c:3853:27: error: 'struct f2fs_inode_info' has no member named 'i_mmap_sem'
 3853 |  down_write(&F2FS_I(inode)->i_mmap_sem);
      |                           ^~
fs/f2fs/data.c:3895:25: error: 'struct f2fs_inode_info' has no member named 'i_mmap_sem'
 3895 |  up_write(&F2FS_I(inode)->i_mmap_sem);
      |                         ^~

Caused by commit

  7cc52cc33717 ("f2fs: swap: support migrating swapfile in aligned write mode")

interacting with commit

  c3762b9d26e1 ("f2fs: Convert to using invalidate_lock")

from the ext3 tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 Jun 2021 10:40:54 +1000
Subject: [PATCH] fix up for "f2fs: Convert to using invalidate_lock"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/f2fs/data.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 2fc1b71c640b..acf2dea65abc 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3850,7 +3850,7 @@ static int f2fs_migrate_blocks(struct inode *inode, block_t start_blk,
 	int ret = 0;
 
 	down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-	down_write(&F2FS_I(inode)->i_mmap_sem);
+	filemap_invalidate_lock(inode->i_mapping);
 
 	set_inode_flag(inode, FI_ALIGNED_WRITE);
 
@@ -3892,7 +3892,7 @@ static int f2fs_migrate_blocks(struct inode *inode, block_t start_blk,
 	clear_inode_flag(inode, FI_DO_DEFRAG);
 	clear_inode_flag(inode, FI_ALIGNED_WRITE);
 
-	up_write(&F2FS_I(inode)->i_mmap_sem);
+	filemap_invalidate_unlock(inode->i_mapping);
 	up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 
 	return ret;
-- 
2.30.2

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2021-06-23  0:49 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-23  0:49 Stephen Rothwell [this message]
2021-07-11  3:08 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2021-07-23  1:11 Stephen Rothwell
2021-08-27  0:28 ` 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=20210623104922.30a5a3fa@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=chao@kernel.org \
    --cc=jack@suse.cz \
    --cc=jaegeuk@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=yuchao0@huawei.com \
    --subject='Re: linux-next: build failure after merge of the f2fs tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).