linux-next: manual merge of the aio tree with the vfs tree

[Stephen Rothwell]

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)