From 0ee729fa66a3f8ce8fa889e0dbd72cff2344ffad Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 5 Sep 2008 16:43:20 -0400
Subject: [PATCH] --- yaml --- r: 128926 b: refs/heads/master c:
 50ec891cc54fb865c4c40c45845e60123e0e66ca h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/fs/btrfs/export.c | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 7a11d34e80d0..a66bbdc39df4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91c0827de247303c6dfc40a8ec9d8305e1d07986
+refs/heads/master: 50ec891cc54fb865c4c40c45845e60123e0e66ca
diff --git a/trunk/fs/btrfs/export.c b/trunk/fs/btrfs/export.c
index 292b0b24c302..2b357a6d2407 100644
--- a/trunk/fs/btrfs/export.c
+++ b/trunk/fs/btrfs/export.c
@@ -68,7 +68,6 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
 {
 	struct btrfs_root *root;
 	struct inode *inode;
-	struct dentry *result;
 	struct btrfs_key key;
 
 	key.objectid = root_objectid;
@@ -92,11 +91,7 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
 		return ERR_PTR(-ESTALE);
 	}
 
-	result = d_obtain_alias(inode);
-	if (!result)
-		return ERR_PTR(-ENOMEM);
-
-	return result;
+	return d_obtain_alias(inode);
 }
 
 static struct dentry *btrfs_fh_to_parent(struct super_block *sb, struct fid *fh,
@@ -148,8 +143,6 @@ static struct dentry *btrfs_fh_to_dentry(struct super_block *sb, struct fid *fh,
 static struct dentry *btrfs_get_parent(struct dentry *child)
 {
 	struct inode *dir = child->d_inode;
-	struct inode *inode;
-	struct dentry *parent;
 	struct btrfs_root *root = BTRFS_I(dir)->root;
 	struct btrfs_key key;
 	struct btrfs_path *path;
@@ -203,13 +196,7 @@ static struct dentry *btrfs_get_parent(struct dentry *child)
 	btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
 	key.offset = 0;
 
-	inode = btrfs_iget(root->fs_info->sb, &key, root, NULL);
-
-	parent = d_obtain_alias(inode);
-	if (!parent)
-		parent = ERR_PTR(-ENOMEM);
-
-	return parent;
+	return d_obtain_alias(btrfs_iget(root->fs_info->sb, &key, root, NULL));
 }
 
 const struct export_operations btrfs_export_ops = {