Message ID | 1244207155-2092-11-git-send-email-dedekind@infradead.org |
---|---|
State | New, archived |
Headers | show |
On Fri, 2009-06-05 at 16:05 +0300, Artem Bityutskiy wrote: > From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> > > ... use new VFS helpers instead. > > Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> > Cc: David Woodhouse <dwmw2@infradead.org> > Cc: linux-mtd@lists.infradead.org Presumably this is intended for Al's tree rather than mine? I could massage it and apply it here, but then someone would just have to massage it back when they eventually get merged. Acked-by: David Woodhouse <David.Woodhouse@intel.com>
On Sat, 2009-06-06 at 08:25 +0100, David Woodhouse wrote: > On Fri, 2009-06-05 at 16:05 +0300, Artem Bityutskiy wrote: > > From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> > > > > ... use new VFS helpers instead. > > > > Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> > > Cc: David Woodhouse <dwmw2@infradead.org> > > Cc: linux-mtd@lists.infradead.org > > Presumably this is intended for Al's tree rather than mine? I could > massage it and apply it here, but then someone would just have to > massage it back when they eventually get merged. > > Acked-by: David Woodhouse <David.Woodhouse@intel.com> Thanks. Sure, this is for Al, I've just CCed FS maintainers to show them the change.
diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h index 2228380..ad12212 100644 --- a/fs/jffs2/os-linux.h +++ b/fs/jffs2/os-linux.h @@ -147,7 +147,7 @@ void jffs2_nor_wbuf_flash_cleanup(struct jffs2_sb_info *c); /* erase.c */ static inline void jffs2_erase_pending_trigger(struct jffs2_sb_info *c) { - OFNI_BS_2SFFJ(c)->s_dirt = 1; + mark_sb_dirty(OFNI_BS_2SFFJ(c)); } /* background.c */ diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index f7bfd3a..5b321fa 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -58,7 +58,7 @@ static void jffs2_write_super(struct super_block *sb) struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); lock_super(sb); - sb->s_dirt = 0; + mark_sb_clean(sb); if (!(sb->s_flags & MS_RDONLY)) { D1(printk(KERN_DEBUG "jffs2_write_super()\n")); @@ -193,7 +193,7 @@ static void jffs2_put_super (struct super_block *sb) lock_kernel(); - if (sb->s_dirt) + if (is_sb_dirty(sb)) jffs2_write_super(sb); mutex_lock(&c->alloc_sem);