Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (46 commits)
  [PATCH] fs: add a sanity check in d_free
  [PATCH] i_version: remount support
  [patch] vfs: make security_inode_setattr() calling consistent
  [patch 1/3] FS_MBCACHE: don't needlessly make it built-in
  [PATCH] move executable checking into ->permission()
  [PATCH] fs/dcache.c: update comment of d_validate()
  [RFC PATCH] touch_mnt_namespace when the mount flags change
  [PATCH] reiserfs: add missing llseek method
  [PATCH] fix ->llseek for more directories
  [PATCH vfs-2.6 6/6] vfs: add LOOKUP_RENAME_TARGET intent
  [PATCH vfs-2.6 5/6] vfs: remove LOOKUP_PARENT from non LOOKUP_PARENT lookup
  [PATCH vfs-2.6 4/6] vfs: remove unnecessary fsnotify_d_instantiate()
  [PATCH vfs-2.6 3/6] vfs: add __d_instantiate() helper
  [PATCH vfs-2.6 2/6] vfs: add d_ancestor()
  [PATCH vfs-2.6 1/6] vfs: replace parent == dentry->d_parent by IS_ROOT()
  [PATCH] get rid of on-stack dentry in udf
  [PATCH 2/2] anondev: switch to IDA
  [PATCH 1/2] anondev: init IDR statically
  [JFFS2] Use d_splice_alias() not d_add() in jffs2_lookup()
  [PATCH] Optimise NFS readdir hack slightly.
  ...

1 files changed, 9 insertions, 14 deletions

diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 046e027a4cb1..64d2ba980df4 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -471,31 +471,26 @@ out:
  */
 static int ecryptfs_read_super(struct super_block *sb, const char *dev_name)
 {
+        struct path path;
         int rc;
-        struct nameidata nd;
-        struct dentry *lower_root;
-        struct vfsmount *lower_mnt;
 
-        memset(&nd, 0, sizeof(struct nameidata));
-        rc = path_lookup(dev_name, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &nd);
+        rc = kern_path(dev_name, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &path);
         if (rc) {
                 ecryptfs_printk(KERN_WARNING, "path_lookup() failed\n");
                 goto out;
         }
-        lower_root = nd.path.dentry;
-        lower_mnt = nd.path.mnt;
-        ecryptfs_set_superblock_lower(sb, lower_root->d_sb);
-        sb->s_maxbytes = lower_root->d_sb->s_maxbytes;
-        sb->s_blocksize = lower_root->d_sb->s_blocksize;
-        ecryptfs_set_dentry_lower(sb->s_root, lower_root);
-        ecryptfs_set_dentry_lower_mnt(sb->s_root, lower_mnt);
-        rc = ecryptfs_interpose(lower_root, sb->s_root, sb, 0);
+        ecryptfs_set_superblock_lower(sb, path.dentry->d_sb);
+        sb->s_maxbytes = path.dentry->d_sb->s_maxbytes;
+        sb->s_blocksize = path.dentry->d_sb->s_blocksize;
+        ecryptfs_set_dentry_lower(sb->s_root, path.dentry);
+        ecryptfs_set_dentry_lower_mnt(sb->s_root, path.mnt);
+        rc = ecryptfs_interpose(path.dentry, sb->s_root, sb, 0);
         if (rc)
                 goto out_free;
         rc = 0;
         goto out;
 out_free:
-        path_put(&nd.path);
+        path_put(&path);
 out:
         return rc;
 }