aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorJoakim Tjernlund <joakim.tjernlund@transmode.se>2010-05-19 17:13:19 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-05-19 17:15:36 +0100
commit64a5c2eb82d2a626116fde8a0ea3bb39a3f4f233 (patch)
tree2c3df4e9dbee07c56b9edd01a700f1d8a4329d0d /fs/jffs2
parentjffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases (diff)
downloadlinux-dev-64a5c2eb82d2a626116fde8a0ea3bb39a3f4f233.tar.xz
linux-dev-64a5c2eb82d2a626116fde8a0ea3bb39a3f4f233.zip
jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger()
Now that we do erases from GC and trigger the GC thread to do them instead of using kupdated, this function is misnamed. It's only used for triggering wbuf flush on NAND flash now. Rename it accordingly. Signed-off-by: Joakim Tjernlund <joakim.tjernlund@transmode.se> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/os-linux.h3
-rw-r--r--fs/jffs2/wbuf.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h
index a7f03b7ebcb3..035a767f958b 100644
--- a/fs/jffs2/os-linux.h
+++ b/fs/jffs2/os-linux.h
@@ -140,8 +140,7 @@ void jffs2_nor_wbuf_flash_cleanup(struct jffs2_sb_info *c);
#endif /* WRITEBUFFER */
-/* erase.c */
-static inline void jffs2_erase_pending_trigger(struct jffs2_sb_info *c)
+static inline void jffs2_dirty_trigger(struct jffs2_sb_info *c)
{
OFNI_BS_2SFFJ(c)->s_dirt = 1;
}
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index be114beca13e..07ee1546b2fa 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -84,7 +84,7 @@ static void jffs2_wbuf_dirties_inode(struct jffs2_sb_info *c, uint32_t ino)
struct jffs2_inodirty *new;
/* Mark the superblock dirty so that kupdated will flush... */
- jffs2_erase_pending_trigger(c);
+ jffs2_dirty_trigger(c);
if (jffs2_wbuf_pending_for_ino(c, ino))
return;