On 02/02/2012 04:21 PM, Brian Norris wrote: > There were a few instances of the old MTD interface remaining for JFFS2. We > fix one error that shows up (only when CONFIG_JFFS2_FS_WRITEBUFFER is not > defined) like this: > > fs/jffs2/read.c: In function 'jffs2_read_dnode': > fs/jffs2/read.c:36:8: error: 'struct mtd_info' has no member named 'read' > fs/jffs2/read.c:112:8: error: 'struct mtd_info' has no member named 'read' > ... > > We also simply remove two macros that are not in use, were not updated to > the new MTD interface, and don't even utilize the old interface properly. > (That means they weren't used since commit 8593fbc6, year 2006; almost 6 > years ago, for those who don't want to do the math) > > Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> > Signed-off-by: Brian Norris <computersforpeace@xxxxxxxxx> Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Thanks. > --- > This fixes some linux-next build errors seen by Randy Dunlap > > fs/jffs2/os-linux.h | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h > index ab65ee3..1cd3aec 100644 > --- a/fs/jffs2/os-linux.h > +++ b/fs/jffs2/os-linux.h > @@ -76,7 +76,7 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f) > #define jffs2_write_nand_cleanmarker(c,jeb) (-EIO) > > #define jffs2_flash_write(c, ofs, len, retlen, buf) jffs2_flash_direct_write(c, ofs, len, retlen, buf) > -#define jffs2_flash_read(c, ofs, len, retlen, buf) ((c)->mtd->read((c)->mtd, ofs, len, retlen, buf)) > +#define jffs2_flash_read(c, ofs, len, retlen, buf) (mtd_read((c)->mtd, ofs, len, retlen, buf)) > #define jffs2_flush_wbuf_pad(c) ({ do{} while(0); (void)(c), 0; }) > #define jffs2_flush_wbuf_gc(c, i) ({ do{} while(0); (void)(c), (void) i, 0; }) > #define jffs2_write_nand_badblock(c,jeb,bad_offset) (1) > @@ -108,8 +108,6 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f) > > #define jffs2_cleanmarker_oob(c) (c->mtd->type == MTD_NANDFLASH) > > -#define jffs2_flash_write_oob(c, ofs, len, retlen, buf) ((c)->mtd->write_oob((c)->mtd, ofs, len, retlen, buf)) > -#define jffs2_flash_read_oob(c, ofs, len, retlen, buf) ((c)->mtd->read_oob((c)->mtd, ofs, len, retlen, buf)) > #define jffs2_wbuf_dirty(c) (!!(c)->wbuf_len) > > /* wbuf.c */ -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html