From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, Theodore Ts'o <tytso@mit.edu>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Namjae Jeon <namjae.jeon@samsung.com>,
Ashish Sangwan <a.sangwan@samsung.com>
Subject: linux-next: manual merge of the vfs tree with the ext4 tree
Date: Tue, 27 May 2014 12:07:53 +1000 [thread overview]
Message-ID: <20140527120753.5fd79bc1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1812 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/ext4/file.c between commit 00532604c72e ("ext4: introduce new
i_write_mutex to protect fallocate") from the ext4 tree and commit
9b884164d597 ("convert ext4 to ->write_iter()") 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/ext4/file.c
index 8c39305abc23,708aad768199..000000000000
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@@ -101,13 -97,10 +97,12 @@@ ext4_file_write_iter(struct kiocb *iocb
struct blk_plug plug;
int o_direct = file->f_flags & O_DIRECT;
int overwrite = 0;
- size_t length = iov_length(iov, nr_segs);
+ size_t length = iov_iter_count(from);
ssize_t ret;
-
- BUG_ON(iocb->ki_pos != pos);
+ loff_t pos = iocb->ki_pos;
+ mutex_lock(&EXT4_I(inode)->i_write_mutex);
+
/*
* Unaligned direct AIO must be serialized; see comment above
* In the case of O_APPEND, assume that we must always serialize
@@@ -116,8 -109,9 +111,8 @@@
ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) &&
!is_sync_kiocb(iocb) &&
(file->f_flags & O_APPEND ||
- ext4_unaligned_aio(inode, iov, nr_segs, pos))) {
+ ext4_unaligned_aio(inode, from, pos))) {
- aio_mutex = ext4_aio_mutex(inode);
- mutex_lock(aio_mutex);
+ unaligned_direct_aio = true;
ext4_unwritten_wait(inode);
}
@@@ -181,10 -172,8 +174,10 @@@
}
}
- ret = __generic_file_aio_write(iocb, iov, nr_segs);
+ ret = __generic_file_write_iter(iocb, from);
mutex_unlock(&inode->i_mutex);
+ if (!unaligned_direct_aio)
+ mutex_unlock(&EXT4_I(inode)->i_write_mutex);
if (ret > 0) {
ssize_t err;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-05-27 2:08 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-27 2:07 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-01-27 22:51 linux-next: manual merge of the vfs tree with the ext4 tree 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-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
2011-07-18 3:36 Stephen Rothwell
2011-07-25 2:38 ` 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=20140527120753.5fd79bc1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=a.sangwan@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=namjae.jeon@samsung.com \
--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).