From 64a5c2eb82d2a626116fde8a0ea3bb39a3f4f233 Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Wed, 19 May 2010 17:13:19 +0100 Subject: 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 Signed-off-by: David Woodhouse --- fs/jffs2/os-linux.h | 3 +-- fs/jffs2/wbuf.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h index a7f03b7..035a767 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 be114be..07ee154 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; -- cgit v1.1