aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ubifs/lprops.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ubifs/lprops.c')
-rw-r--r--fs/ubifs/lprops.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
index 2ba93da71b65..3659b887743b 100644
--- a/fs/ubifs/lprops.c
+++ b/fs/ubifs/lprops.c
@@ -125,6 +125,7 @@ static void adjust_lpt_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap,
125 } 125 }
126 } 126 }
127 } 127 }
128
128 /* Not greater than parent, so compare to children */ 129 /* Not greater than parent, so compare to children */
129 while (1) { 130 while (1) {
130 /* Compare to left child */ 131 /* Compare to left child */
@@ -576,7 +577,6 @@ const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c,
576 ubifs_assert(!(lprops->free & 7) && !(lprops->dirty & 7)); 577 ubifs_assert(!(lprops->free & 7) && !(lprops->dirty & 7));
577 578
578 spin_lock(&c->space_lock); 579 spin_lock(&c->space_lock);
579
580 if ((lprops->flags & LPROPS_TAKEN) && lprops->free == c->leb_size) 580 if ((lprops->flags & LPROPS_TAKEN) && lprops->free == c->leb_size)
581 c->lst.taken_empty_lebs -= 1; 581 c->lst.taken_empty_lebs -= 1;
582 582
@@ -637,11 +637,8 @@ const struct ubifs_lprops *ubifs_change_lp(struct ubifs_info *c,
637 c->lst.taken_empty_lebs += 1; 637 c->lst.taken_empty_lebs += 1;
638 638
639 change_category(c, lprops); 639 change_category(c, lprops);
640
641 c->idx_gc_cnt += idx_gc_cnt; 640 c->idx_gc_cnt += idx_gc_cnt;
642
643 spin_unlock(&c->space_lock); 641 spin_unlock(&c->space_lock);
644
645 return lprops; 642 return lprops;
646} 643}
647 644
@@ -1262,7 +1259,6 @@ static int scan_check_cb(struct ubifs_info *c,
1262 } 1259 }
1263 1260
1264 ubifs_scan_destroy(sleb); 1261 ubifs_scan_destroy(sleb);
1265
1266 return LPT_SCAN_CONTINUE; 1262 return LPT_SCAN_CONTINUE;
1267 1263
1268out_print: 1264out_print: