From: Roel Kluin <roel.kluin@gmail.com>
Date: Fri, 5 Feb 2010 09:26:27 +0000 (+0100)
Subject: ocfs2: Fix contiguousness check in ocfs2_try_to_merge_extent_map()
X-Git-Tag: MMI-PSA29.97-13-9~24997^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd6b0bf87d8cf3d9cfeadeb12dbf5449e3e50765;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ocfs2: Fix contiguousness check in ocfs2_try_to_merge_extent_map()

The wrong member was compared in the continguousness check.

Acked-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
---

diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c
index d35a27f4523e..5328529e7fd2 100644
--- a/fs/ocfs2/extent_map.c
+++ b/fs/ocfs2/extent_map.c
@@ -192,7 +192,7 @@ static int ocfs2_try_to_merge_extent_map(struct ocfs2_extent_map_item *emi,
 		emi->ei_clusters += ins->ei_clusters;
 		return 1;
 	} else if ((ins->ei_phys + ins->ei_clusters) == emi->ei_phys &&
-		   (ins->ei_cpos + ins->ei_clusters) == emi->ei_phys &&
+		   (ins->ei_cpos + ins->ei_clusters) == emi->ei_cpos &&
 		   ins->ei_flags == emi->ei_flags) {
 		emi->ei_phys = ins->ei_phys;
 		emi->ei_cpos = ins->ei_cpos;