From 2021ef848fc17e22a8d971f4813c8e5bf122b0a6 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 6 Nov 2009 11:06:37 +0000
Subject: [PATCH] --- yaml --- r: 169203 b: refs/heads/master c:
 1579343a73e32b5886e186e8f3e4db85e420ed3f h: refs/heads/master i:   169201:
 02cc58bdd11fe6f816fe9a7e4aac0293c696e970   169199:
 fb27c6c5154cea85fd086b00772dcaf35cd3dbcd v: v3

---
 [refs]              |  2 +-
 trunk/fs/gfs2/dir.c | 34 +---------------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/[refs] b/[refs]
index 5ef78d82715b..5c56178c8757 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdcfde62dac64c86ff34e483c595d568a252c433
+refs/heads/master: 1579343a73e32b5886e186e8f3e4db85e420ed3f
diff --git a/trunk/fs/gfs2/dir.c b/trunk/fs/gfs2/dir.c
index 297d7e5cebad..25fddc100f18 100644
--- a/trunk/fs/gfs2/dir.c
+++ b/trunk/fs/gfs2/dir.c
@@ -525,38 +525,6 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf,
 	return ERR_PTR(-EIO);
 }
 
-
-/**
- * dirent_first - Return the first dirent
- * @dip: the directory
- * @bh: The buffer
- * @dent: Pointer to list of dirents
- *
- * return first dirent whether bh points to leaf or stuffed dinode
- *
- * Returns: IS_LEAF, IS_DINODE, or -errno
- */
-
-static int dirent_first(struct gfs2_inode *dip, struct buffer_head *bh,
-			struct gfs2_dirent **dent)
-{
-	struct gfs2_meta_header *h = (struct gfs2_meta_header *)bh->b_data;
-
-	if (be32_to_cpu(h->mh_type) == GFS2_METATYPE_LF) {
-		if (gfs2_meta_check(GFS2_SB(&dip->i_inode), bh))
-			return -EIO;
-		*dent = (struct gfs2_dirent *)(bh->b_data +
-					       sizeof(struct gfs2_leaf));
-		return IS_LEAF;
-	} else {
-		if (gfs2_metatype_check(GFS2_SB(&dip->i_inode), bh, GFS2_METATYPE_DI))
-			return -EIO;
-		*dent = (struct gfs2_dirent *)(bh->b_data +
-					       sizeof(struct gfs2_dinode));
-		return IS_DINODE;
-	}
-}
-
 static int dirent_check_reclen(struct gfs2_inode *dip,
 			       const struct gfs2_dirent *d, const void *end_p)
 {
@@ -1006,7 +974,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name)
 	divider = (start + half_len) << (32 - dip->i_depth);
 
 	/*  Copy the entries  */
-	dirent_first(dip, obh, &dent);
+	dent = (struct gfs2_dirent *)(obh->b_data + sizeof(struct gfs2_leaf));
 
 	do {
 		next = dent;