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

---
 [refs]                 |  2 +-
 trunk/fs/btrfs/ctree.h |  2 --
 trunk/fs/btrfs/inode.c | 13 -------------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index d9210a4753bc..2922901f9bb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad3d81ba8f2880dfa3ee518c779a7ea09a024520
+refs/heads/master: a237d2a2bd67eb2b57b87c1e1d3d802d078d4ba7
diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h
index f720b582fd5b..754c738ec2e8 100644
--- a/trunk/fs/btrfs/ctree.h
+++ b/trunk/fs/btrfs/ctree.h
@@ -1763,8 +1763,6 @@ void btrfs_destroy_cachep(void);
 long btrfs_ioctl_trans_end(struct file *file);
 struct inode *btrfs_iget_locked(struct super_block *s, u64 objectid,
 				struct btrfs_root *root);
-struct inode *btrfs_ilookup(struct super_block *s, u64 objectid,
-			    u64 root_objectid);
 struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,
 			 struct btrfs_root *root, int *is_new);
 int btrfs_commit_write(struct file *file, struct page *page,
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 65df9d830230..b4dbb5c97646 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -1818,19 +1818,6 @@ static int btrfs_find_actor(struct inode *inode, void *opaque)
 		args->root == BTRFS_I(inode)->root);
 }
 
-struct inode *btrfs_ilookup(struct super_block *s, u64 objectid,
-			    u64 root_objectid)
-{
-	struct btrfs_iget_args args;
-	args.ino = objectid;
-	args.root = btrfs_lookup_fs_root(btrfs_sb(s)->fs_info, root_objectid);
-
-	if (!args.root)
-		return NULL;
-
-	return ilookup5(s, objectid, btrfs_find_actor, (void *)&args);
-}
-
 struct inode *btrfs_iget_locked(struct super_block *s, u64 objectid,
 				struct btrfs_root *root)
 {