Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26731
b: refs/heads/master
c: 194a61b
h: refs/heads/master
i:
  26729: 62e5486
  26727: d860d47
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed May 15, 2006
1 parent 45d6526 commit 5090ed5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d3779e7989cfdba854b843fe605f8df9e991cd18
refs/heads/master: 194a61b8e09ac526c33777a688ee2a1504d7fbc3
6 changes: 4 additions & 2 deletions trunk/fs/jffs2/nodelist.c
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,8 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info
if (c->mtd->point) {
err = c->mtd->point(c->mtd, ofs, len, &retlen, &buffer);
if (!err && retlen < tn->csize) {
JFFS2_WARNING("MTD point returned len too short: %u instead of %u.\n", retlen, tn->csize);
JFFS2_WARNING("MTD point returned len too short: %zu "
"instead of %u.\n", retlen, tn->csize);
c->mtd->unpoint(c->mtd, buffer, ofs, len);
} else if (err)
JFFS2_WARNING("MTD point failed: error code %d.\n", err);
Expand All @@ -461,7 +462,8 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info
}

if (retlen != len) {
JFFS2_ERROR("short read at %#08x: %d instead of %d.\n", ofs, retlen, len);
JFFS2_ERROR("short read at %#08x: %zd instead of %d.\n",
ofs, retlen, len);
err = -EIO;
goto free_out;
}
Expand Down

0 comments on commit 5090ed5

Please sign in to comment.