Patchwork [PATCH} : Fix compilation warnings in fs/jffs2/nodemgmt.c

login
register
mail settings
Submitter Manish Katiyar
Date Oct. 27, 2008, 1:30 p.m.
Message ID <ea11fea30810270630x2740ceb3m58df4d0093a86fee@mail.gmail.com>
Download mbox | patch
Permalink /patch/5913/
State New, archived
Headers show

Comments

Manish Katiyar - Oct. 27, 2008, 1:30 p.m.
Below patch fixes the following compilation warnings :
fs/jffs2/nodemgmt.c: In function 'jffs2_find_nextblock':
fs/jffs2/nodemgmt.c:265: error: 'struct jffs2_sb_info' has no member
named 'wbuf_ofs'
fs/jffs2/nodemgmt.c:265: error: 'struct jffs2_sb_info' has no member
named 'wbuf_len'
fs/jffs2/nodemgmt.c:266: error: 'struct jffs2_sb_info' has no member
named 'wbuf_ofs'
make[2]: *** [fs/jffs2/nodemgmt.o] Error 1


Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
---
 fs/jffs2/nodemgmt.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Paulius Zaleckas - Oct. 29, 2008, 8:01 a.m.
Manish Katiyar wrote:
> Below patch fixes the following compilation warnings :
> fs/jffs2/nodemgmt.c: In function 'jffs2_find_nextblock':
> fs/jffs2/nodemgmt.c:265: error: 'struct jffs2_sb_info' has no member
> named 'wbuf_ofs'
> fs/jffs2/nodemgmt.c:265: error: 'struct jffs2_sb_info' has no member
> named 'wbuf_len'
> fs/jffs2/nodemgmt.c:266: error: 'struct jffs2_sb_info' has no member
> named 'wbuf_ofs'
> make[2]: *** [fs/jffs2/nodemgmt.o] Error 1
> 

You are too late. This is already fixed and patch is in mtd git tree.

> 
> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>

Patch

diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
index 0875b60..21a0529 100644
--- a/fs/jffs2/nodemgmt.c
+++ b/fs/jffs2/nodemgmt.c
@@ -261,9 +261,11 @@  static int jffs2_find_nextblock(struct jffs2_sb_info *c)

 	jffs2_sum_reset_collected(c->summary); /* reset collected summary */

+#ifdef CONFIG_JFFS2_FS_WRITEBUFFER
 	/* adjust write buffer offset, else we get a non contiguous write bug */
 	if (!(c->wbuf_ofs % c->sector_size) && !c->wbuf_len)
 		c->wbuf_ofs = 0xffffffff;
+#endif

 	D1(printk(KERN_DEBUG "jffs2_find_nextblock(): new nextblock =
0x%08x\n", c->nextblock->offset));