diff options
Diffstat (limited to 'fs/jffs2/os-linux.h')
-rw-r--r-- | fs/jffs2/os-linux.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h index e07a0edcdb4f..80daea96bbc2 100644 --- a/fs/jffs2/os-linux.h +++ b/fs/jffs2/os-linux.h | |||
@@ -1,14 +1,12 @@ | |||
1 | /* | 1 | /* |
2 | * JFFS2 -- Journalling Flash File System, Version 2. | 2 | * JFFS2 -- Journalling Flash File System, Version 2. |
3 | * | 3 | * |
4 | * Copyright (C) 2002-2003 Red Hat, Inc. | 4 | * Copyright © 2001-2007 Red Hat, Inc. |
5 | * | 5 | * |
6 | * Created by David Woodhouse <dwmw2@infradead.org> | 6 | * Created by David Woodhouse <dwmw2@infradead.org> |
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.64 2005/09/30 13:59:13 dedekind Exp $ | ||
11 | * | ||
12 | */ | 10 | */ |
13 | 11 | ||
14 | #ifndef __JFFS2_OS_LINUX_H__ | 12 | #ifndef __JFFS2_OS_LINUX_H__ |
@@ -98,6 +96,9 @@ static inline void jffs2_init_inode_info(struct jffs2_inode_info *f) | |||
98 | #define jffs2_nor_wbuf_flash(c) (0) | 96 | #define jffs2_nor_wbuf_flash(c) (0) |
99 | #define jffs2_nor_wbuf_flash_setup(c) (0) | 97 | #define jffs2_nor_wbuf_flash_setup(c) (0) |
100 | #define jffs2_nor_wbuf_flash_cleanup(c) do {} while (0) | 98 | #define jffs2_nor_wbuf_flash_cleanup(c) do {} while (0) |
99 | #define jffs2_ubivol(c) (0) | ||
100 | #define jffs2_ubivol_setup(c) (0) | ||
101 | #define jffs2_ubivol_cleanup(c) do {} while (0) | ||
101 | 102 | ||
102 | #else /* NAND and/or ECC'd NOR support present */ | 103 | #else /* NAND and/or ECC'd NOR support present */ |
103 | 104 | ||
@@ -133,6 +134,9 @@ void jffs2_nand_flash_cleanup(struct jffs2_sb_info *c); | |||
133 | #define jffs2_dataflash(c) (c->mtd->type == MTD_DATAFLASH) | 134 | #define jffs2_dataflash(c) (c->mtd->type == MTD_DATAFLASH) |
134 | int jffs2_dataflash_setup(struct jffs2_sb_info *c); | 135 | int jffs2_dataflash_setup(struct jffs2_sb_info *c); |
135 | void jffs2_dataflash_cleanup(struct jffs2_sb_info *c); | 136 | void jffs2_dataflash_cleanup(struct jffs2_sb_info *c); |
137 | #define jffs2_ubivol(c) (c->mtd->type == MTD_UBIVOLUME) | ||
138 | int jffs2_ubivol_setup(struct jffs2_sb_info *c); | ||
139 | void jffs2_ubivol_cleanup(struct jffs2_sb_info *c); | ||
136 | 140 | ||
137 | #define jffs2_nor_wbuf_flash(c) (c->mtd->type == MTD_NORFLASH && ! (c->mtd->flags & MTD_BIT_WRITEABLE)) | 141 | #define jffs2_nor_wbuf_flash(c) (c->mtd->type == MTD_NORFLASH && ! (c->mtd->flags & MTD_BIT_WRITEABLE)) |
138 | int jffs2_nor_wbuf_flash_setup(struct jffs2_sb_info *c); | 142 | int jffs2_nor_wbuf_flash_setup(struct jffs2_sb_info *c); |