Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6

Resolve conflicts with the VFS atomic open and sget changes.

Conflicts:
	fs/nfs/nfs4proc.c

1 files changed, 3 insertions, 4 deletions

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index a07441a0a878..da52cdbe8388 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -173,7 +173,7 @@ ecryptfs_do_create(struct inode *directory_inode,
                 inode = ERR_CAST(lower_dir_dentry);
                 goto out;
         }
-        rc = vfs_create(lower_dir_dentry->d_inode, lower_dentry, mode, NULL);
+        rc = vfs_create(lower_dir_dentry->d_inode, lower_dentry, mode, true);
         if (rc) {
                 printk(KERN_ERR "%s: Failure to create dentry in lower fs; "
                        "rc = [%d]\n", __func__, rc);
@@ -240,7 +240,6 @@ out:
  * @dir: The inode of the directory in which to create the file.
  * @dentry: The eCryptfs dentry
  * @mode: The mode of the new file.
- * @nd: nameidata
  *
  * Creates a new file.
  *
@@ -248,7 +247,7 @@ out:
  */
 static int
 ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry,
-                umode_t mode, struct nameidata *nd)
+                umode_t mode, bool excl)
 {
         struct inode *ecryptfs_inode;
         int rc;
@@ -374,7 +373,7 @@ static int ecryptfs_lookup_interpose(struct dentry *dentry,
  */
 static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
                                       struct dentry *ecryptfs_dentry,
-                                      struct nameidata *ecryptfs_nd)
+                                      unsigned int flags)
 {
         char *encrypted_and_encoded_name = NULL;
         size_t encrypted_and_encoded_name_size;