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>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the f2fs tree with the ext3 tree
Date: Wed, 25 Aug 2021 09:51:48 +1000 [thread overview]
Message-ID: <20210825095148.1eb9bc54@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]
Hi all,
Today's linux-next merge of the f2fs tree got a conflict in:
fs/f2fs/file.c
between commit:
edc6d01bad73 ("f2fs: Convert to using invalidate_lock")
from the ext3 tree and commit:
4817758c80ad ("f2fs: adjust unlock order for cleanup")
from the f2fs tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/f2fs/file.c
index 1ff333755721,3330efb41f22..000000000000
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@@ -3473,8 -3496,8 +3494,8 @@@ static int f2fs_release_compress_blocks
released_blocks += ret;
}
- up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
- up_write(&F2FS_I(inode)->i_mmap_sem);
+ filemap_invalidate_unlock(inode->i_mapping);
+ up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
out:
inode_unlock(inode);
@@@ -3626,8 -3649,8 +3647,8 @@@ static int f2fs_reserve_compress_blocks
reserved_blocks += ret;
}
- up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
- up_write(&F2FS_I(inode)->i_mmap_sem);
+ filemap_invalidate_unlock(inode->i_mapping);
+ up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
if (ret >= 0) {
clear_inode_flag(inode, FI_COMPRESS_RELEASED);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-08-24 23:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 23:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-07-23 0:21 linux-next: manual merge of the f2fs tree with the ext3 tree 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=20210825095148.1eb9bc54@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chao@kernel$(echo .)org \
--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