From 00993137634b8459a7a4938341d006abfefd14c3 Mon Sep 17 00:00:00 2001
From: Tao Ma <tao.ma@oracle.com>
Date: Mon, 5 Jan 2009 14:45:24 +0800
Subject: [PATCH] --- yaml --- r: 125909 b: refs/heads/master c:
 9047beabb8a396f0b18de1e4a9ab920cf92054af h: refs/heads/master i:   125907:
 014e4244c9f32fbcfbd67b2b2c55fab9322e986c v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ocfs2/alloc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3f14389a0fc3..e706ab9515c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dad7d975e4bd893c79fd122105b37b9a1776816a
+refs/heads/master: 9047beabb8a396f0b18de1e4a9ab920cf92054af
diff --git a/trunk/fs/ocfs2/alloc.c b/trunk/fs/ocfs2/alloc.c
index 874c0bd9e1cc..54ff4c77aaa3 100644
--- a/trunk/fs/ocfs2/alloc.c
+++ b/trunk/fs/ocfs2/alloc.c
@@ -3402,8 +3402,8 @@ static int ocfs2_merge_rec_left(struct inode *inode,
 			has_empty_extent = 1;
 	}
 
-	ret = ocfs2_path_bh_journal_access(handle, inode, left_path,
-					   path_num_items(left_path) - 1);
+	ret = ocfs2_path_bh_journal_access(handle, inode, right_path,
+					   path_num_items(right_path) - 1);
 	if (ret) {
 		mlog_errno(ret);
 		goto out;