Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25090a6b authored by David Woodhouse's avatar David Woodhouse
Browse files

[JFFS2] Discard remaining free space when filing a dirty block in scan. 



The incoming ref_totlen() calculation is going to rely on the existence
of nodes which cover all dirty space. We can't just tweak the accounting
data any more; we have to call jffs2_scan_dirty_space() to do it.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 68270995

fs/jffs2/scan.c

+26 −21
Original line number Original line Diff line number Diff line
@@ -65,6 +65,25 @@ static inline uint32_t EMPTY_SCAN_SIZE(uint32_t sector_size) { 
		return DEFAULT_EMPTY_SCAN_SIZE;

		return DEFAULT_EMPTY_SCAN_SIZE;

}

}





static int file_dirty(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)

{

	int ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size);

	if (ret)

		return ret;

	/* Turned wasted size into dirty, since we apparently 

	   think it's recoverable now. */

	jeb->dirty_size += jeb->wasted_size;

	c->dirty_size += jeb->wasted_size;

	c->wasted_size -= jeb->wasted_size;

	jeb->wasted_size = 0;

	if (VERYDIRTY(c, jeb->dirty_size)) {

		list_add(&jeb->list, &c->very_dirty_list);

	} else {

		list_add(&jeb->list, &c->dirty_list);

	}

	return 0;

}



int jffs2_scan_medium(struct jffs2_sb_info *c)

int jffs2_scan_medium(struct jffs2_sb_info *c)

{

{

	int i, ret;

	int i, ret;
@@ -170,34 +189,20 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) 
					(!c->nextblock || c->nextblock->free_size < jeb->free_size)) {

					(!c->nextblock || c->nextblock->free_size < jeb->free_size)) {

				/* Better candidate for the next writes to go to */

				/* Better candidate for the next writes to go to */

				if (c->nextblock) {

				if (c->nextblock) {

					c->nextblock->dirty_size += c->nextblock->free_size + c->nextblock->wasted_size;

					ret = file_dirty(c, c->nextblock);

					c->dirty_size += c->nextblock->free_size + c->nextblock->wasted_size;

					if (ret)

					c->free_size -= c->nextblock->free_size;

						return ret;

					c->wasted_size -= c->nextblock->wasted_size;

					c->nextblock->free_size = c->nextblock->wasted_size = 0;

					if (VERYDIRTY(c, c->nextblock->dirty_size)) {

						list_add(&c->nextblock->list, &c->very_dirty_list);

					} else {

						list_add(&c->nextblock->list, &c->dirty_list);

					}

					/* deleting summary information of the old nextblock */

					/* deleting summary information of the old nextblock */

					jffs2_sum_reset_collected(c->summary);

					jffs2_sum_reset_collected(c->summary);

				}

				}

				/* update collected summary infromation for the current nextblock */

				/* update collected summary information for the current nextblock */

				jffs2_sum_move_collected(c, s);

				jffs2_sum_move_collected(c, s);

				D1(printk(KERN_DEBUG "jffs2_scan_medium(): new nextblock = 0x%08x\n", jeb->offset));

				D1(printk(KERN_DEBUG "jffs2_scan_medium(): new nextblock = 0x%08x\n", jeb->offset));

				c->nextblock = jeb;

				c->nextblock = jeb;

			} else {

			} else {

				jeb->dirty_size += jeb->free_size + jeb->wasted_size;

				ret = file_dirty(c, jeb);

				c->dirty_size += jeb->free_size + jeb->wasted_size;

				if (ret)

				c->free_size -= jeb->free_size;

					return ret;

				c->wasted_size -= jeb->wasted_size;

				jeb->free_size = jeb->wasted_size = 0;

				if (VERYDIRTY(c, jeb->dirty_size)) {

					list_add(&jeb->list, &c->very_dirty_list);

				} else {

					list_add(&jeb->list, &c->dirty_list);

				}

			}

			}

			break;

			break;