btrfs: simplify iget helpers

[sfrench/cifs-2.6.git] / fs / btrfs / export.c

diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c
index e7cc98b4d7dc4bea382490a11f0524abb720e1fe..1a8d419d9e1f4707c2d0fe2177896fd096164559 100644 (file)
--- a/fs/btrfs/export.c
+++ b/fs/btrfs/export.c
@@ -64,7 +64,6 @@ struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
        struct btrfs_fs_info *fs_info = btrfs_sb(sb);
        struct btrfs_root *root;
        struct inode *inode;
-       struct btrfs_key key;
 
        if (objectid < BTRFS_FIRST_FREE_OBJECTID)
                return ERR_PTR(-ESTALE);
@@ -73,11 +72,7 @@ struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
        if (IS_ERR(root))
                return ERR_CAST(root);
 
-       key.objectid = objectid;
-       key.type = BTRFS_INODE_ITEM_KEY;
-       key.offset = 0;
-
-       inode = btrfs_iget(sb, &key, root);
+       inode = btrfs_iget(sb, objectid, root);
        btrfs_put_root(root);
        if (IS_ERR(inode))
                return ERR_CAST(inode);
@@ -196,9 +191,7 @@ struct dentry *btrfs_get_parent(struct dentry *child)
                                        found_key.offset, 0, 0);
        }
 
-       key.type = BTRFS_INODE_ITEM_KEY;
-       key.offset = 0;
-       return d_obtain_alias(btrfs_iget(fs_info->sb, &key, root));
+       return d_obtain_alias(btrfs_iget(fs_info->sb, key.objectid, root));
 fail:
        btrfs_free_path(path);
        return ERR_PTR(ret);