diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2010-02-05 10:26:27 +0100 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-02-06 00:06:21 +0100 |
| commit | bd6b0bf87d8cf3d9cfeadeb12dbf5449e3e50765 (patch) | |
| tree | 0a84ae5f42d5e7dc21fcfeeb04fa115afa034c4a /fs/ocfs2/extent_map.c | |
| parent | ocfs2/dlm: Remove BUG_ON in dlm recovery when freeing locks of a dead node (diff) | |
| download | linux-bd6b0bf87d8cf3d9cfeadeb12dbf5449e3e50765.tar.xz linux-bd6b0bf87d8cf3d9cfeadeb12dbf5449e3e50765.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |