Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27727
b: refs/heads/master
c: fb6a82c
h: refs/heads/master
i:
  27725: ad2f226
  27723: 84dec92
  27719: 6329cd0
  27711: 7666cfa
v: v3
  • Loading branch information
Randy Dunlap authored and David Woodhouse committed Apr 12, 2006
1 parent 55651ef commit 08baff1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 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: b104513c74d972f09737017394c5abc7e0a6835d
refs/heads/master: fb6a82c94a9c69adfb6b9f6ce9f84be36884e471
6 changes: 3 additions & 3 deletions trunk/fs/jffs2/readinode.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref

tn = jffs2_alloc_tmp_dnode_info();
if (!tn) {
JFFS2_ERROR("failed to allocate tn (%d bytes).\n", sizeof(*tn));
JFFS2_ERROR("failed to allocate tn (%zu bytes).\n", sizeof(*tn));
return -ENOMEM;
}

Expand Down Expand Up @@ -434,7 +434,7 @@ static int read_more(struct jffs2_sb_info *c, struct jffs2_raw_node_ref *ref,
}

if (retlen < len) {
JFFS2_ERROR("short read at %#08x: %d instead of %d.\n",
JFFS2_ERROR("short read at %#08x: %zu instead of %d.\n",
offs, retlen, len);
return -EIO;
}
Expand Down Expand Up @@ -542,7 +542,7 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf
}

if (retlen < len) {
JFFS2_ERROR("short read at %#08x: %d instead of %d.\n", ref_offset(ref), retlen, len);
JFFS2_ERROR("short read at %#08x: %zu instead of %d.\n", ref_offset(ref), retlen, len);
err = -EIO;
goto free_out;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/jffs2/summary.c
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock


if (ret || (retlen != infosize)) {
JFFS2_WARNING("Write of %zd bytes at 0x%08x failed. returned %d, retlen %zd\n",
JFFS2_WARNING("Write of %d bytes at 0x%08x failed. returned %d, retlen %zu\n",
infosize, jeb->offset + c->sector_size - jeb->free_size, ret, retlen);

c->summary->sum_size = JFFS2_SUMMARY_NOSUM_SIZE;
Expand Down

0 comments on commit 08baff1

Please sign in to comment.