diff options
author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2010-05-19 12:13:19 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-19 12:15:36 -0400 |
commit | 64a5c2eb82d2a626116fde8a0ea3bb39a3f4f233 (patch) | |
tree | 2c3df4e9dbee07c56b9edd01a700f1d8a4329d0d | |
parent | ae3b6ba06c8ed399ef920724ee8136e540878294 (diff) |
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>
-rw-r--r-- | fs/jffs2/os-linux.h | 3 | ||||
-rw-r--r-- | 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 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); | |||
140 | 140 | ||
141 | #endif /* WRITEBUFFER */ | 141 | #endif /* WRITEBUFFER */ |
142 | 142 | ||
143 | /* erase.c */ | 143 | static inline void jffs2_dirty_trigger(struct jffs2_sb_info *c) |
144 | static inline void jffs2_erase_pending_trigger(struct jffs2_sb_info *c) | ||
145 | { | 144 | { |
146 | OFNI_BS_2SFFJ(c)->s_dirt = 1; | 145 | OFNI_BS_2SFFJ(c)->s_dirt = 1; |
147 | } | 146 | } |
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) | |||
84 | struct jffs2_inodirty *new; | 84 | struct jffs2_inodirty *new; |
85 | 85 | ||
86 | /* Mark the superblock dirty so that kupdated will flush... */ | 86 | /* Mark the superblock dirty so that kupdated will flush... */ |
87 | jffs2_erase_pending_trigger(c); | 87 | jffs2_dirty_trigger(c); |
88 | 88 | ||
89 | if (jffs2_wbuf_pending_for_ino(c, ino)) | 89 | if (jffs2_wbuf_pending_for_ino(c, ino)) |
90 | return; | 90 | return; |