diff options
author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-05-03 11:19:02 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-23 07:19:07 -0400 |
commit | 8cd79216676d9122fa714615e6b49553761aca8a (patch) | |
tree | 148c1c6abe0e9241a0a701d05518386128424a97 /fs/jffs2/os-linux.h | |
parent | c25bb1f59ca6ebbee2649d82533537d4bf123609 (diff) |
[JFFS2] Fix NOR only compile
Fix the bug that caouses problems when compiling for NOR.
We read a newly erased block so we don't need to check ECC.
Define jffs2_is_writebuffered as zero if there is no wbuf.
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2/os-linux.h')
-rw-r--r-- | fs/jffs2/os-linux.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h index 8989cd685e46..5a2d2ee4f641 100644 --- a/fs/jffs2/os-linux.h +++ b/fs/jffs2/os-linux.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: os-linux.h,v 1.54 2005/02/09 09:23:53 pavlov Exp $ | 10 | * $Id: os-linux.h,v 1.56 2005/05/03 15:19:00 dedekind Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
@@ -99,11 +99,11 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f) | |||
99 | 99 | ||
100 | 100 | ||
101 | #define jffs2_is_readonly(c) (OFNI_BS_2SFFJ(c)->s_flags & MS_RDONLY) | 101 | #define jffs2_is_readonly(c) (OFNI_BS_2SFFJ(c)->s_flags & MS_RDONLY) |
102 | #define jffs2_is_writebuffered(c) (c->wbuf != NULL) | ||
103 | 102 | ||
104 | #ifndef CONFIG_JFFS2_FS_WRITEBUFFER | 103 | #ifndef CONFIG_JFFS2_FS_WRITEBUFFER |
105 | #define SECTOR_ADDR(x) ( ((unsigned long)(x) & ~(c->sector_size-1)) ) | 104 | #define SECTOR_ADDR(x) ( ((unsigned long)(x) & ~(c->sector_size-1)) ) |
106 | #define jffs2_can_mark_obsolete(c) (1) | 105 | #define jffs2_can_mark_obsolete(c) (1) |
106 | #define jffs2_is_writebuffered(c) (0) | ||
107 | #define jffs2_cleanmarker_oob(c) (0) | 107 | #define jffs2_cleanmarker_oob(c) (0) |
108 | #define jffs2_write_nand_cleanmarker(c,jeb) (-EIO) | 108 | #define jffs2_write_nand_cleanmarker(c,jeb) (-EIO) |
109 | 109 | ||
@@ -125,6 +125,7 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f) | |||
125 | 125 | ||
126 | #else /* NAND and/or ECC'd NOR support present */ | 126 | #else /* NAND and/or ECC'd NOR support present */ |
127 | 127 | ||
128 | #define jffs2_is_writebuffered(c) (c->wbuf != NULL) | ||
128 | #define SECTOR_ADDR(x) ( ((unsigned long)(x) / (unsigned long)(c->sector_size)) * c->sector_size ) | 129 | #define SECTOR_ADDR(x) ( ((unsigned long)(x) / (unsigned long)(c->sector_size)) * c->sector_size ) |
129 | #define jffs2_can_mark_obsolete(c) ((c->mtd->type == MTD_NORFLASH && !(c->mtd->flags & MTD_ECC)) || c->mtd->type == MTD_RAM) | 130 | #define jffs2_can_mark_obsolete(c) ((c->mtd->type == MTD_NORFLASH && !(c->mtd->flags & MTD_ECC)) || c->mtd->type == MTD_RAM) |
130 | #define jffs2_cleanmarker_oob(c) (c->mtd->type == MTD_NANDFLASH) | 131 | #define jffs2_cleanmarker_oob(c) (c->mtd->type == MTD_NANDFLASH) |