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, 5 insertions, 28 deletions

diff --git a/fs/isofs/export.c b/fs/isofs/export.c
index bb219138331a..e81a30593ba9 100644
--- a/fs/isofs/export.c
+++ b/fs/isofs/export.c
@@ -22,7 +22,7 @@ isofs_export_iget(struct super_block *sb,
                   __u32 generation)
 {
         struct inode *inode;
-        struct dentry *result;
+
         if (block == 0)
                 return ERR_PTR(-ESTALE);
         inode = isofs_iget(sb, block, offset);
@@ -32,12 +32,7 @@ isofs_export_iget(struct super_block *sb,
                 iput(inode);
                 return ERR_PTR(-ESTALE);
         }
-        result = d_alloc_anon(inode);
-        if (!result) {
-                iput(inode);
-                return ERR_PTR(-ENOMEM);
-        }
-        return result;
+        return d_obtain_alias(inode);
 }
 
 /* This function is surprisingly simple.  The trick is understanding
@@ -51,7 +46,6 @@ static struct dentry *isofs_export_get_parent(struct dentry *child)
         unsigned long parent_offset = 0;
         struct inode *child_inode = child->d_inode;
         struct iso_inode_info *e_child_inode = ISOFS_I(child_inode);
-        struct inode *parent_inode = NULL;
         struct iso_directory_record *de = NULL;
         struct buffer_head * bh = NULL;
         struct dentry *rv = NULL;
@@ -104,28 +98,11 @@ static struct dentry *isofs_export_get_parent(struct dentry *child)
         /* Normalize */
         isofs_normalize_block_and_offset(de, &parent_block, &parent_offset);
 
-        /* Get the inode. */
-        parent_inode = isofs_iget(child_inode->i_sb,
-                                  parent_block,
-                                  parent_offset);
-        if (IS_ERR(parent_inode)) {
-                rv = ERR_CAST(parent_inode);
-                if (rv != ERR_PTR(-ENOMEM))
-                        rv = ERR_PTR(-EACCES);
-                goto out;
-        }
-
-        /* Allocate the dentry. */
-        rv = d_alloc_anon(parent_inode);
-        if (rv == NULL) {
-                rv = ERR_PTR(-ENOMEM);
-                goto out;
-        }
-
+        rv = d_obtain_alias(isofs_iget(child_inode->i_sb, parent_block,
+                                     parent_offset));
  out:
-        if (bh) {
+        if (bh)
                 brelse(bh);
-        }
         return rv;
 }