projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cda70ba
)
ocfs2: Fix contiguousness check in ocfs2_try_to_merge_extent_map()
author
Roel Kluin
<
[email protected]
>
Fri, 5 Feb 2010 09:26:27 +0000
(10:26 +0100)
committer
Joel Becker
<
[email protected]
>
Fri, 5 Feb 2010 23:06:21 +0000
(15:06 -0800)
The wrong member was compared in the continguousness check.
Acked-by: Tao Ma <
[email protected]
>
Signed-off-by: Roel Kluin <
[email protected]
>
Signed-off-by: Joel Becker <
[email protected]
>
fs/ocfs2/extent_map.c
patch
|
blob
|
history
diff --git
a/fs/ocfs2/extent_map.c
b/fs/ocfs2/extent_map.c
index d35a27f4523e13e2ec00411e08e6ebb2e1afbf76..5328529e7fd289e963da8cfa7b66d5706babb00c 100644
(file)
--- 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_
phy
s &&
+ (ins->ei_cpos + ins->ei_clusters) == emi->ei_
cpo
s &&
ins->ei_flags == emi->ei_flags) {
emi->ei_phys = ins->ei_phys;
emi->ei_cpos = ins->ei_cpos;