From: Tao Ma <tao.ma@oracle.com>
Date: Mon, 5 Jan 2009 06:45:24 +0000 (+0800)
Subject: ocfs2: Access the right buffer_head in ocfs2_merge_rec_left.
X-Git-Tag: v2.6.29-rc1~505^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9047beabb8a396f0b18de1e4a9ab920cf92054af;p=profile%2Fivi%2Fkernel-x86-ivi.git

ocfs2: Access the right buffer_head in ocfs2_merge_rec_left.

In commit "ocfs2: Use metadata-specific ocfs2_journal_access_*()
functions", the wrong buffer_head is accessed. So change it
to the right buffer_head.

Signed-off-by: Tao Ma <tao.ma@oracle.com>
Acked-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
---

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 874c0bd..54ff4c77 100644
--- a/fs/ocfs2/alloc.c
+++ b/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;