aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/extent_map.c
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2010-02-05 10:26:27 +0100
committerJoel Becker <joel.becker@oracle.com>2010-02-05 15:06:21 -0800
commitbd6b0bf87d8cf3d9cfeadeb12dbf5449e3e50765 (patch)
tree0a84ae5f42d5e7dc21fcfeeb04fa115afa034c4a /fs/ocfs2/extent_map.c
parentcda70ba8c05a8661f882862c4699a31d215ab151 (diff)
downloadkernel_samsung_espresso10-bd6b0bf87d8cf3d9cfeadeb12dbf5449e3e50765.zip
kernel_samsung_espresso10-bd6b0bf87d8cf3d9cfeadeb12dbf5449e3e50765.tar.gz
kernel_samsung_espresso10-bd6b0bf87d8cf3d9cfeadeb12dbf5449e3e50765.tar.bz2
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>
Diffstat (limited to 'fs/ocfs2/extent_map.c')
-rw-r--r--fs/ocfs2/extent_map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c
index d35a27f..5328529 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;