From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin LaHaise <bcrl@kvack.org>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the aio tree with the vfs tree
Date: Tue, 15 Mar 2016 15:06:40 +1100 [thread overview]
Message-ID: <20160315150640.02a4db30@canb.auug.org.au> (raw)
Hi Ben,
Today's linux-next merge of the aio tree got a conflict in:
fs/namei.c
between commit:
5955102c9984 ("wrappers for ->i_mutex access")
from the vfs tree and commit:
5d3d80fcf992 ("aio: add support for in-submit openat")
from the aio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc fs/namei.c
index 794f81dce766,260782f5a868..000000000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -3125,9 -3079,15 +3125,15 @@@ retry_lookup
* dropping this one anyway.
*/
}
+
+ if (nd->flags & LOOKUP_NONBLOCK) {
+ error = -EAGAIN;
+ goto out;
+ }
+
- mutex_lock(&dir->d_inode->i_mutex);
+ inode_lock(dir->d_inode);
error = lookup_open(nd, &path, file, op, got_write, opened);
- mutex_unlock(&dir->d_inode->i_mutex);
+ inode_unlock(dir->d_inode);
if (error <= 0) {
if (error)
next reply other threads:[~2016-03-15 4:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 4:06 Stephen Rothwell [this message]
2016-03-15 4:34 ` linux-next: manual merge of the aio tree with the vfs tree Al Viro
2016-03-15 4:53 ` Stephen Rothwell
2016-03-15 5:07 ` Al Viro
2016-03-15 5:19 ` Al Viro
2016-03-15 13:12 ` Benjamin LaHaise
-- strict thread matches above, loose matches on Subject: below --
2017-09-11 1:29 Stephen Rothwell
2016-03-14 4:32 Stephen Rothwell
2016-03-14 4:36 ` Stephen Rothwell
2016-03-14 4:41 ` Stephen Rothwell
2016-03-14 7:35 ` Christoph Hellwig
2016-03-14 15:24 ` Benjamin LaHaise
2016-03-15 5:35 ` Al Viro
2016-03-15 13:24 ` Benjamin LaHaise
2016-03-15 8:37 ` Christoph Hellwig
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=20160315150640.02a4db30@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bcrl@kvack.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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).