Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 305147
b: refs/heads/master
c: 25886a3
h: refs/heads/master
i:
  305145: 119c5d7
  305143: 2f8efdc
v: v3
  • Loading branch information
Artem Bityutskiy committed May 20, 2012
1 parent 59e76eb commit 7e01720
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 24 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 56b04e3e8b5cbf71c23a739f34f9a9437afa41fb
refs/heads/master: 25886a368d58edd9bb0f63d4417d2f73592b9dba
5 changes: 1 addition & 4 deletions trunk/drivers/mtd/ubi/debug.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,12 @@
if (unlikely(!(expr))) { \
printk(KERN_CRIT "UBI assert failed in %s at %u (pid %d)\n", \
__func__, __LINE__, current->pid); \
ubi_dbg_dump_stack(); \
dump_stack(); \
} \
} while (0)

#define dbg_err(fmt, ...) ubi_err(fmt, ##__VA_ARGS__)

#define ubi_dbg_dump_stack() dump_stack()

#define ubi_dbg_print_hex_dump(l, ps, pt, r, g, b, len, a) \
print_hex_dump(l, ps, pt, r, g, b, len, a)

Expand Down Expand Up @@ -194,7 +192,6 @@ static inline int ubi_dbg_is_erase_failure(const struct ubi_device *ubi)
#define dbg_io(fmt, ...) ubi_dbg_msg(fmt, ##__VA_ARGS__)
#define dbg_bld(fmt, ...) ubi_dbg_msg(fmt, ##__VA_ARGS__)

static inline void ubi_dbg_dump_stack(void) { return; }
static inline void
ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr) { return; }
static inline void
Expand Down
28 changes: 14 additions & 14 deletions trunk/drivers/mtd/ubi/io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ int ubi_io_read(const struct ubi_device *ubi, void *buf, int pnum, int offset,

ubi_err("error %d%s while reading %d bytes from PEB %d:%d, "
"read %zd bytes", err, errstr, len, pnum, offset, read);
ubi_dbg_dump_stack();
dump_stack();

/*
* The driver should never return -EBADMSG if it failed to read
Expand Down Expand Up @@ -284,7 +284,7 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,
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();
dump_stack();
return -EIO;
}

Expand All @@ -293,7 +293,7 @@ int ubi_io_write(struct ubi_device *ubi, const void *buf, int pnum, int offset,
if (err) {
ubi_err("error %d while writing %d bytes to PEB %d:%d, written "
"%zd bytes", err, len, pnum, offset, written);
ubi_dbg_dump_stack();
dump_stack();
ubi_dbg_dump_flash(ubi, pnum, offset, len);
} else
ubi_assert(written == len);
Expand Down Expand Up @@ -370,7 +370,7 @@ static int do_sync_erase(struct ubi_device *ubi, int pnum)
goto retry;
}
ubi_err("cannot erase PEB %d, error %d", pnum, err);
ubi_dbg_dump_stack();
dump_stack();
return err;
}

Expand All @@ -388,7 +388,7 @@ static int do_sync_erase(struct ubi_device *ubi, int pnum)
goto retry;
}
ubi_err("cannot erase PEB %d", pnum);
ubi_dbg_dump_stack();
dump_stack();
return -EIO;
}

Expand Down Expand Up @@ -722,7 +722,7 @@ static int validate_ec_hdr(const struct ubi_device *ubi,
bad:
ubi_err("bad EC header");
ubi_dbg_dump_ec_hdr(ec_hdr);
ubi_dbg_dump_stack();
dump_stack();
return 1;
}

Expand Down Expand Up @@ -998,7 +998,7 @@ static int validate_vid_hdr(const struct ubi_device *ubi,
bad:
ubi_err("bad VID header");
ubi_dbg_dump_vid_hdr(vid_hdr);
ubi_dbg_dump_stack();
dump_stack();
return 1;
}

Expand Down Expand Up @@ -1153,7 +1153,7 @@ static int paranoid_check_not_bad(const struct ubi_device *ubi, int pnum)
return err;

ubi_err("paranoid check failed for PEB %d", pnum);
ubi_dbg_dump_stack();
dump_stack();
return err > 0 ? -EINVAL : err;
}

Expand Down Expand Up @@ -1192,7 +1192,7 @@ static int paranoid_check_ec_hdr(const struct ubi_device *ubi, int pnum,

fail:
ubi_dbg_dump_ec_hdr(ec_hdr);
ubi_dbg_dump_stack();
dump_stack();
return -EINVAL;
}

Expand Down Expand Up @@ -1227,7 +1227,7 @@ static int paranoid_check_peb_ec_hdr(const struct ubi_device *ubi, int pnum)
ubi_err("bad CRC, calculated %#08x, read %#08x", crc, hdr_crc);
ubi_err("paranoid check failed for PEB %d", pnum);
ubi_dbg_dump_ec_hdr(ec_hdr);
ubi_dbg_dump_stack();
dump_stack();
err = -EINVAL;
goto exit;
}
Expand Down Expand Up @@ -1275,7 +1275,7 @@ static int paranoid_check_vid_hdr(const struct ubi_device *ubi, int pnum,
fail:
ubi_err("paranoid check failed for PEB %d", pnum);
ubi_dbg_dump_vid_hdr(vid_hdr);
ubi_dbg_dump_stack();
dump_stack();
return -EINVAL;

}
Expand Down Expand Up @@ -1315,7 +1315,7 @@ static int paranoid_check_peb_vid_hdr(const struct ubi_device *ubi, int pnum)
"read %#08x", pnum, crc, hdr_crc);
ubi_err("paranoid check failed for PEB %d", pnum);
ubi_dbg_dump_vid_hdr(vid_hdr);
ubi_dbg_dump_stack();
dump_stack();
err = -EINVAL;
goto exit;
}
Expand Down Expand Up @@ -1380,7 +1380,7 @@ int ubi_dbg_check_write(struct ubi_device *ubi, const void *buf, int pnum,
i, i + dump_len);
print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
buf1 + i, dump_len, 1);
ubi_dbg_dump_stack();
dump_stack();
err = -EINVAL;
goto out_free;
}
Expand Down Expand Up @@ -1443,7 +1443,7 @@ int ubi_dbg_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len)
print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, buf, len, 1);
err = -EINVAL;
error:
ubi_dbg_dump_stack();
dump_stack();
vfree(buf);
return err;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/ubi/scan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1598,7 +1598,7 @@ static int paranoid_check_si(struct ubi_device *ubi, struct ubi_scan_info *si)
ubi_dbg_dump_vid_hdr(vidh);

out:
ubi_dbg_dump_stack();
dump_stack();
return -EINVAL;
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/ubi/ubi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ static inline void ubi_ro_mode(struct ubi_device *ubi)
if (!ubi->ro_mode) {
ubi->ro_mode = 1;
ubi_warn("switch to read-only mode");
ubi_dbg_dump_stack();
dump_stack();
}
}

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/mtd/ubi/wl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1603,7 +1603,7 @@ static int paranoid_check_ec(struct ubi_device *ubi, int pnum, int ec)
if (ec != read_ec) {
ubi_err("paranoid check failed for PEB %d", pnum);
ubi_err("read EC is %lld, should be %d", read_ec, ec);
ubi_dbg_dump_stack();
dump_stack();
err = 1;
} else
err = 0;
Expand Down Expand Up @@ -1634,7 +1634,7 @@ static int paranoid_check_in_wl_tree(const struct ubi_device *ubi,

ubi_err("paranoid check failed for PEB %d, EC %d, RB-tree %p ",
e->pnum, e->ec, root);
ubi_dbg_dump_stack();
dump_stack();
return -EINVAL;
}

Expand Down Expand Up @@ -1662,7 +1662,7 @@ static int paranoid_check_in_pq(const struct ubi_device *ubi,

ubi_err("paranoid check failed for PEB %d, EC %d, Protect queue",
e->pnum, e->ec);
ubi_dbg_dump_stack();
dump_stack();
return -EINVAL;
}

Expand Down

0 comments on commit 7e01720

Please sign in to comment.