diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-19 18:05:14 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-19 18:10:44 +0200 |
| commit | ae3b6ba06c8ed399ef920724ee8136e540878294 (patch) | |
| tree | 427f89ac31defa7b3114c50ab706c0f6df539136 /fs/jffs2/scan.c | |
| parent | jffs2: Require jffs2_garbage_collect_trigger() to be called with lock held (diff) | |
| download | linux-ae3b6ba06c8ed399ef920724ee8136e540878294.tar.xz linux-ae3b6ba06c8ed399ef920724ee8136e540878294.zip | |
jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases
This is now done in a GC pass; we don't need to trigger kupdated to do it.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs/jffs2/scan.c')
| -rw-r--r-- | fs/jffs2/scan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index 696686cc206e..46f870d1cc36 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c @@ -260,7 +260,9 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) ret = -EIO; goto out; } - jffs2_erase_pending_trigger(c); + spin_lock(&c->erase_completion_lock); + jffs2_garbage_collect_trigger(c); + spin_unlock(&c->erase_completion_lock); } ret = 0; out: |