git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[pandora-kernel.git]
/
drivers
/
mtd
/
ubi
/
io.c
diff --git
a/drivers/mtd/ubi/io.c
b/drivers/mtd/ubi/io.c
index
8c1b1c7
..
6ba55c2
100644
(file)
--- a/
drivers/mtd/ubi/io.c
+++ b/
drivers/mtd/ubi/io.c
@@
-212,7
+212,7
@@
retry:
} else {
ubi_assert(len == read);
} else {
ubi_assert(len == read);
- if (ubi_dbg_is_bitflip()) {
+ if (ubi_dbg_is_bitflip(
ubi
)) {
dbg_gen("bit-flip (emulated)");
err = UBI_IO_BITFLIPS;
}
dbg_gen("bit-flip (emulated)");
err = UBI_IO_BITFLIPS;
}
@@
-281,7
+281,7
@@
int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,
return err;
}
return err;
}
- if (ubi_dbg_is_write_failure()) {
+ if (ubi_dbg_is_write_failure(
ubi
)) {
dbg_err("cannot write %d bytes to PEB %d:%d "
"(emulated)", len, pnum, offset);
ubi_dbg_dump_stack();
dbg_err("cannot write %d bytes to PEB %d:%d "
"(emulated)", len, pnum, offset);
ubi_dbg_dump_stack();
@@
-396,7
+396,7
@@
retry:
if (err)
return err;
if (err)
return err;
- if (ubi_dbg_is_erase_failure()) {
+ if (ubi_dbg_is_erase_failure(
ubi
)) {
dbg_err("cannot erase PEB %d (emulated)", pnum);
return -EIO;
}
dbg_err("cannot erase PEB %d (emulated)", pnum);
return -EIO;
}
@@
-1146,7
+1146,7
@@
static int paranoid_check_not_bad(const struct ubi_device *ubi, int pnum)
{
int err;
{
int err;
- if (!
(ubi_chk_flags & UBI_CHK_IO)
)
+ if (!
ubi->dbg->chk_io
)
return 0;
err = ubi_io_is_bad(ubi, pnum);
return 0;
err = ubi_io_is_bad(ubi, pnum);
@@
-1173,7
+1173,7
@@
static int paranoid_check_ec_hdr(const struct ubi_device *ubi, int pnum,
int err;
uint32_t magic;
int err;
uint32_t magic;
- if (!
(ubi_chk_flags & UBI_CHK_IO)
)
+ if (!
ubi->dbg->chk_io
)
return 0;
magic = be32_to_cpu(ec_hdr->magic);
return 0;
magic = be32_to_cpu(ec_hdr->magic);
@@
-1211,7
+1211,7
@@
static int paranoid_check_peb_ec_hdr(const struct ubi_device *ubi, int pnum)
uint32_t crc, hdr_crc;
struct ubi_ec_hdr *ec_hdr;
uint32_t crc, hdr_crc;
struct ubi_ec_hdr *ec_hdr;
- if (!
(ubi_chk_flags & UBI_CHK_IO)
)
+ if (!
ubi->dbg->chk_io
)
return 0;
ec_hdr = kzalloc(ubi->ec_hdr_alsize, GFP_NOFS);
return 0;
ec_hdr = kzalloc(ubi->ec_hdr_alsize, GFP_NOFS);
@@
-1255,7
+1255,7
@@
static int paranoid_check_vid_hdr(const struct ubi_device *ubi, int pnum,
int err;
uint32_t magic;
int err;
uint32_t magic;
- if (!
(ubi_chk_flags & UBI_CHK_IO)
)
+ if (!
ubi->dbg->chk_io
)
return 0;
magic = be32_to_cpu(vid_hdr->magic);
return 0;
magic = be32_to_cpu(vid_hdr->magic);
@@
-1296,7
+1296,7
@@
static int paranoid_check_peb_vid_hdr(const struct ubi_device *ubi, int pnum)
struct ubi_vid_hdr *vid_hdr;
void *p;
struct ubi_vid_hdr *vid_hdr;
void *p;
- if (!
(ubi_chk_flags & UBI_CHK_IO)
)
+ if (!
ubi->dbg->chk_io
)
return 0;
vid_hdr = ubi_zalloc_vid_hdr(ubi, GFP_NOFS);
return 0;
vid_hdr = ubi_zalloc_vid_hdr(ubi, GFP_NOFS);
@@
-1348,7
+1348,7
@@
int ubi_dbg_check_write(struct ubi_device *ubi, const void *buf, int pnum,
void *buf1;
loff_t addr = (loff_t)pnum * ubi->peb_size + offset;
void *buf1;
loff_t addr = (loff_t)pnum * ubi->peb_size + offset;
- if (!
(ubi_chk_flags & UBI_CHK_IO)
)
+ if (!
ubi->dbg->chk_io
)
return 0;
buf1 = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
return 0;
buf1 = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
@@
-1412,7
+1412,7
@@
int ubi_dbg_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len)
void *buf;
loff_t addr = (loff_t)pnum * ubi->peb_size + offset;
void *buf;
loff_t addr = (loff_t)pnum * ubi->peb_size + offset;
- if (!
(ubi_chk_flags & UBI_CHK_IO)
)
+ if (!
ubi->dbg->chk_io
)
return 0;
buf = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);
return 0;
buf = __vmalloc(len, GFP_NOFS, PAGE_KERNEL);