git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
fs
/
ext4
/
block_validity.c
diff --git
a/fs/ext4/block_validity.c
b/fs/ext4/block_validity.c
index
538c486
..
5b6973f
100644
(file)
--- a/
fs/ext4/block_validity.c
+++ b/
fs/ext4/block_validity.c
@@
-72,9
+72,9
@@
static int add_system_zone(struct ext4_sb_info *sbi,
else if (start_blk >= (entry->start_blk + entry->count))
n = &(*n)->rb_right;
else {
else if (start_blk >= (entry->start_blk + entry->count))
n = &(*n)->rb_right;
else {
- if (start_blk + count > (entry->start_blk +
+ if (start_blk + count > (entry->start_blk +
entry->count))
entry->count))
- entry->count = (start_blk + count -
+ entry->count = (start_blk + count -
entry->start_blk);
new_node = *n;
new_entry = rb_entry(new_node, struct ext4_system_zone,
entry->start_blk);
new_node = *n;
new_entry = rb_entry(new_node, struct ext4_system_zone,