diff options
| author | wdenk <wdenk> | 2004-04-18 21:13:41 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-04-18 21:13:41 +0000 |
| commit | 507bbe3e8084a82c20399367801da87db7d14e65 (patch) | |
| tree | 0660633e2e1caf4b819fd46ed43f83e3e05c5523 /fs/jffs2 | |
| parent | 998eaaecd46ee5f00550e30e606cb5556e0b9345 (diff) | |
| download | u-boot-imx-507bbe3e8084a82c20399367801da87db7d14e65.zip u-boot-imx-507bbe3e8084a82c20399367801da87db7d14e65.tar.gz u-boot-imx-507bbe3e8084a82c20399367801da87db7d14e65.tar.bz2 | |
* Patch by Yasushi Shoji, 07 Apr 2004:
- add support for microblaze processors
- add support for AtmarkTechno "suzaku" board
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 9acf37b..10e6df8 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -182,8 +182,8 @@ static int read_nand_cached(u32 off, u32 size, u_char *buf) if (!nand_cache) { /* This memory never gets freed but 'cause it's a bootloader, nobody cares */ - nand_cache = malloc(NAND_CACHE_SIZE); - if (!nand_cache) { + nand_cache = malloc(NAND_CACHE_SIZE); + if (!nand_cache) { printf("read_nand_cached: can't alloc cache size %d bytes\n", NAND_CACHE_SIZE); return -1; @@ -241,7 +241,7 @@ static void *get_node_mem(u32 off) return ret; } -static void put_fl_mem(void *buf) +static void put_fl_mem(void *buf) { free(buf); } @@ -258,7 +258,7 @@ static inline void *get_node_mem(u32 off) return (void*)off; } -static inline void put_fl_mem(void *buf) +static inline void put_fl_mem(void *buf) { } @@ -414,7 +414,7 @@ static int compare_dirents(struct b_node *new, struct b_node *old) struct jffs2_raw_dirent ojOld; struct jffs2_raw_dirent *jNew = (struct jffs2_raw_dirent *)get_fl_mem(new->offset, sizeof(ojNew), &ojNew); - struct jffs2_raw_dirent *jOld = + struct jffs2_raw_dirent *jOld = (struct jffs2_raw_dirent *)get_fl_mem(old->offset, sizeof(ojOld), &ojOld); int cmp; @@ -511,7 +511,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest) * we will live with it. */ for (b = pL->frag.listHead; b != NULL; b = b->next) { - jNode = (struct jffs2_raw_inode *) get_fl_mem(b->offset, + jNode = (struct jffs2_raw_inode *) get_fl_mem(b->offset, sizeof(struct jffs2_raw_inode), NULL); if ((inode == jNode->ino)) { /* get actual file length from the newest node */ |