From bd77e0e2ae3e31650499608cc5868c6b75e54222 Mon Sep 17 00:00:00 2001
From: Tao Ma <tao.ma@oracle.com>
Date: Wed, 29 Apr 2009 01:20:55 +0800
Subject: [PATCH] --- yaml --- r: 144390 b: refs/heads/master c:
 7e31a966ad270ba32a77c157c015cd7c82faaa55 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ocfs2/namei.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e3e04009259d..e0606c78502a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5a0a630922a2f6a774b6dac19f70cb5abd86bb0
+refs/heads/master: 7e31a966ad270ba32a77c157c015cd7c82faaa55
diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c
index 2220f93f668b..33464c6b60a2 100644
--- a/trunk/fs/ocfs2/namei.c
+++ b/trunk/fs/ocfs2/namei.c
@@ -1025,10 +1025,8 @@ static int ocfs2_rename(struct inode *old_dir,
 	struct inode *orphan_dir = NULL;
 	struct ocfs2_dinode *newfe = NULL;
 	char orphan_name[OCFS2_ORPHAN_NAMELEN + 1];
-	struct buffer_head *orphan_entry_bh = NULL;
 	struct buffer_head *newfe_bh = NULL;
 	struct buffer_head *old_inode_bh = NULL;
-	struct buffer_head *insert_entry_bh = NULL;
 	struct ocfs2_super *osb = NULL;
 	u64 newfe_blkno, old_de_ino;
 	handle_t *handle = NULL;
@@ -1455,8 +1453,6 @@ static int ocfs2_rename(struct inode *old_dir,
 	brelse(old_inode_bh);
 	brelse(old_dir_bh);
 	brelse(new_dir_bh);
-	brelse(orphan_entry_bh);
-	brelse(insert_entry_bh);
 
 	mlog_exit(status);