git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
fs
/
jffs2
/
wbuf.c
diff --git
a/fs/jffs2/wbuf.c
b/fs/jffs2/wbuf.c
index
254f441
..
2470eef
100644
(file)
--- a/
fs/jffs2/wbuf.c
+++ b/
fs/jffs2/wbuf.c
@@
-9,7
+9,7
@@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
*
* For licensing information, see the file 'LICENCE' in this directory.
*
- * $Id: wbuf.c,v 1.7
2 2004/09/11 19:22:43 gleixner
Exp $
+ * $Id: wbuf.c,v 1.7
0 2004/07/13 08:58:25 dwmw2
Exp $
*
*/
*
*/
@@
-225,7
+225,7
@@
static void jffs2_wbuf_recover(struct jffs2_sb_info *c)
/* Do the read... */
ret = c->mtd->read_ecc(c->mtd, start, c->wbuf_ofs - start, &retlen, buf, NULL, c->oobinfo);
/* Do the read... */
ret = c->mtd->read_ecc(c->mtd, start, c->wbuf_ofs - start, &retlen, buf, NULL, c->oobinfo);
- if (ret == -E
BADMSG
&& retlen == c->wbuf_ofs - start) {
+ if (ret == -E
IO
&& retlen == c->wbuf_ofs - start) {
/* ECC recovered */
ret = 0;
}
/* ECC recovered */
ret = 0;
}
@@
-791,7
+791,7
@@
int jffs2_flash_read(struct jffs2_sb_info *c, loff_t ofs, size_t len, size_t *re
if (!jffs2_can_mark_obsolete(c)) {
ret = c->mtd->read_ecc(c->mtd, ofs, len, retlen, buf, NULL, c->oobinfo);
if (!jffs2_can_mark_obsolete(c)) {
ret = c->mtd->read_ecc(c->mtd, ofs, len, retlen, buf, NULL, c->oobinfo);
- if ( (ret == -E
BADMSG
) && (*retlen == len) ) {
+ if ( (ret == -E
IO
) && (*retlen == len) ) {
printk(KERN_WARNING "mtd->read(0x%zx bytes from 0x%llx) returned ECC error\n",
len, ofs);
/*
printk(KERN_WARNING "mtd->read(0x%zx bytes from 0x%llx) returned ECC error\n",
len, ofs);
/*
@@
-1047,7
+1047,7
@@
int jffs2_nand_set_oobinfo(struct jffs2_sb_info *c)
if (oinfo && oinfo->useecc == MTD_NANDECC_AUTOPLACE) {
D1(printk(KERN_DEBUG "JFFS2 using autoplace on NAND\n"));
/* Get the position of the free bytes */
if (oinfo && oinfo->useecc == MTD_NANDECC_AUTOPLACE) {
D1(printk(KERN_DEBUG "JFFS2 using autoplace on NAND\n"));
/* Get the position of the free bytes */
- if (!oinfo->oobfree[0][
1
]) {
+ if (!oinfo->oobfree[0][
0
]) {
printk (KERN_WARNING "jffs2_nand_set_oobinfo(): Eeep. Autoplacement selected and no empty space in oob\n");
return -ENOSPC;
}
printk (KERN_WARNING "jffs2_nand_set_oobinfo(): Eeep. Autoplacement selected and no empty space in oob\n");
return -ENOSPC;
}