summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Ma <tao.ma@oracle.com>2009-01-05 14:45:24 +0800
committerMark Fasheh <mfasheh@suse.com>2009-01-05 08:40:37 -0800
commit9047beabb8a396f0b18de1e4a9ab920cf92054af (patch)
treeabb7ea8752cd3e2fdfeaaf1609aed155d919aa7d
parentdad7d975e4bd893c79fd122105b37b9a1776816a (diff)
downloadlinux-3.10-9047beabb8a396f0b18de1e4a9ab920cf92054af.tar.gz
linux-3.10-9047beabb8a396f0b18de1e4a9ab920cf92054af.tar.bz2
linux-3.10-9047beabb8a396f0b18de1e4a9ab920cf92054af.zip
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>
-rw-r--r--fs/ocfs2/alloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 874c0bd9e1c..54ff4c77aaa 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;