From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Theodore Ts'o" <tytso@mit.edu>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>,
Amir Goldstein <amir73il@users.sf.net>,
Al Viro <viro@ZenIV.linux.org.uk>
Subject: Re: linux-next: manual merge of the vfs tree with the ext4 tree
Date: Mon, 25 Jul 2011 12:38:56 +1000 [thread overview]
Message-ID: <20110725123856.1e61415ac8e90d106d0585c8@canb.auug.org.au> (raw)
In-Reply-To: <20110718133625.f78ac5eb9a4a2084665003fd@canb.auug.org.au>
Hi all,
On Mon, 18 Jul 2011 13:36:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in
> fs/ext4/inode.c between commit dae1e52cb126 ("ext4: move ext4_ind_*
> functions from inode.c to indirect.c") from the ext4 tree and commit
> d1769fea6879 ("fs: simplify the blockdev_direct_IO prototype") from the
> vfs tree.
>
> A function moved to a new file. I fixed it up and can carry the fix as
> necessary.
>
> I also needed the following merge fix patch:
This patchg is now needed after merging the ext4 tree with Linius' tree
(repeated here):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Jul 2011 13:28:44 +1000
Subject: [PATCH] vfs/ext4: merge fixup for moved function
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/ext4/indirect.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index 6c27111..b8602cd 100644
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -806,10 +806,8 @@ retry:
offset, nr_segs,
ext4_get_block, NULL, NULL, 0);
else {
- ret = blockdev_direct_IO(rw, iocb, inode,
- inode->i_sb->s_bdev, iov,
- offset, nr_segs,
- ext4_get_block, NULL);
+ ret = blockdev_direct_IO(rw, iocb, inode, iov,
+ offset, nr_segs, ext4_get_block);
if (unlikely((rw & WRITE) && ret < 0)) {
loff_t isize = i_size_read(inode);
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
next prev parent reply other threads:[~2011-07-25 2:39 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-18 3:36 linux-next: manual merge of the vfs tree with the ext4 tree Stephen Rothwell
2011-07-25 2:38 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-01-27 22:51 Stephen Rothwell
2016-05-17 0:23 Stephen Rothwell
2016-05-17 3:16 ` Theodore Ts'o
2016-05-18 14:25 ` Arnd Bergmann
2016-05-19 1:26 ` Stephen Rothwell
2015-06-09 2:47 Stephen Rothwell
2015-05-11 0:49 Stephen Rothwell
2015-04-15 1:35 Stephen Rothwell
2015-04-14 1:30 Stephen Rothwell
2015-04-14 1:48 ` Al Viro
2015-04-14 17:00 ` Theodore Ts'o
2015-04-14 17:17 ` Al Viro
2015-04-14 21:02 ` Theodore Ts'o
2015-04-14 21:14 ` Al Viro
2015-04-13 1:48 Stephen Rothwell
2015-04-13 1:43 Stephen Rothwell
2015-04-07 4:00 Stephen Rothwell
2015-04-07 7:02 ` Christoph Hellwig
2015-04-07 7:36 ` Stephen Rothwell
2015-04-08 3:26 ` Theodore Ts'o
2015-04-14 16:18 ` Christoph Hellwig
2015-04-14 20:43 ` Theodore Ts'o
2014-05-27 2:07 Stephen Rothwell
2014-04-22 1:13 Stephen Rothwell
2012-01-06 2:54 Stephen Rothwell
2012-01-06 20:46 ` Djalal Harouni
2011-12-21 0:18 Stephen Rothwell
2011-12-21 0:43 ` Stephen Rothwell
2009-05-19 4:23 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=20110725123856.1e61415ac8e90d106d0585c8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=amir73il@users.sf.net \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@ZenIV.linux.org.uk \
/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
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;
as well as URLs for NNTP newsgroup(s).