]> bbs.cooldavid.org Git - net-next-2.6.git/commit
jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return
authorDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 19 May 2010 15:37:13 +0000 (16:37 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 19 May 2010 15:49:37 +0000 (16:49 +0100)
commit0717bf8411bb673dd2369aaa096f7396446b38f5
tree5106504557aae93a018bf3a5692ce9b0558e857e
parent9957abea31aed5783d6ca7175cce553045c0eb19
jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return

jffs2_garbage_collect_pass() would previously return -EAGAIN if it
couldn't find anything to garbage collect from, and there were blocks on
the erase_pending_list. If the blocks were actually in the process of
being erased, though, then they wouldn't be on that list. Check for
nr_erasing_blocks being non-zero instead.

Fix jffs2_reserve_space() to wait for the in-progress erases to
complete, when jffs2_garbage_collect_pass() returns -EAGAIN.

And fix jffs2_erase_succeeded() to actually wake up the erase_wait wq
that jffs2_reserve_space() is now using.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
fs/jffs2/erase.c
fs/jffs2/gc.c
fs/jffs2/nodemgmt.c