From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Jaegeuk Kim <jaegeuk.kim@samsung•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Chao Yu <chao2.yu@samsung•com>
Subject: linux-next: manual merge of the vfs tree with the f2fs tree
Date: Tue, 29 Apr 2014 10:37:03 +1000 [thread overview]
Message-ID: <20140429103703.efca943550755ccb0ed875eb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/f2fs/file.c
between commit adeb670f1fee ("f2fs: introduce f2fs_seek_block to support
SEEK_{DATA, HOLE} in llseek") from the f2fs tree and commits 8eb02141b8a6
("switch simple generic_file_aio_read() users to ->read_iter()") and
e6552301fb08 ("write_iter variants of {__,}generic_file_aio_write()")
from the vfs tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/f2fs/file.c
index b9f4fbf5c07e,e4ba4b93f96a..000000000000
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@@ -802,11 -678,11 +802,11 @@@ long f2fs_compat_ioctl(struct file *fil
#endif
const struct file_operations f2fs_file_operations = {
- .llseek = generic_file_llseek,
+ .llseek = f2fs_llseek,
- .read = do_sync_read,
- .write = do_sync_write,
- .aio_read = generic_file_aio_read,
- .aio_write = generic_file_aio_write,
+ .read = new_sync_read,
+ .write = new_sync_write,
+ .read_iter = generic_file_read_iter,
+ .write_iter = generic_file_write_iter,
.open = generic_file_open,
.mmap = f2fs_file_mmap,
.fsync = f2fs_sync_file,
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-04-29 0:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-29 0:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-06-10 1:23 linux-next: manual merge of the vfs tree with the f2fs tree Stephen Rothwell
2015-04-13 1:53 Stephen Rothwell
2015-05-07 2:05 Stephen Rothwell
2016-05-03 1:41 Stephen Rothwell
2016-07-25 0:21 Stephen Rothwell
2017-02-27 0:05 Stephen Rothwell
2017-02-27 8:27 ` David Howells
2017-11-08 23:01 Stephen Rothwell
2017-11-08 23:06 Stephen Rothwell
2018-10-03 0:12 Stephen Rothwell
2021-04-19 0:53 Stephen Rothwell
2023-12-19 23:47 Stephen Rothwell
2023-12-20 0:13 ` Stephen Rothwell
2023-12-20 1:34 ` Al Viro
2023-12-20 3:05 ` Stephen Rothwell
2023-12-20 4:44 ` Al Viro
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=20140429103703.efca943550755ccb0ed875eb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chao2.yu@samsung$(echo .)com \
--cc=jaegeuk.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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