X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_iam.c;fp=lustre%2Fosd-ldiskfs%2Fosd_iam.c;h=96d8b479363c25619bc94170769642bd155e6082;hb=8f793f14bf9928352623e61122f005252605b136;hp=56881d6069610e7e0fab288129d4f27e948a3fc2;hpb=490bb7a658d6d7a3608633b7416a6cf09e0d225b;p=fs%2Flustre-release.git diff --git a/lustre/osd-ldiskfs/osd_iam.c b/lustre/osd-ldiskfs/osd_iam.c index 56881d6..96d8b47 100644 --- a/lustre/osd-ldiskfs/osd_iam.c +++ b/lustre/osd-ldiskfs/osd_iam.c @@ -166,7 +166,7 @@ iam_load_idle_blocks(struct iam_container *c, iam_ptr_t blk) bh = __ldiskfs_bread(NULL, inode, blk, 0); if (IS_ERR_OR_NULL(bh)) { - CERROR("%s: cannot load idle blocks, blk = %u, err = %ld\n", + CERROR("%s: cannot load idle blocks, blk = %u: rc = %ld\n", osd_ino2name(inode), blk, bh ? PTR_ERR(bh) : -EIO); c->ic_idle_failed = 1; if (bh == NULL) @@ -176,11 +176,14 @@ iam_load_idle_blocks(struct iam_container *c, iam_ptr_t blk) head = (struct iam_idle_head *)(bh->b_data); if (le16_to_cpu(head->iih_magic) != IAM_IDLE_HEADER_MAGIC) { - CERROR("%s: invalid idle block head, blk = %u, magic = %d\n", - osd_ino2name(inode), blk, le16_to_cpu(head->iih_magic)); + int rc = -EBADF; + + CERROR("%s: invalid idle block head, blk = %u, magic = %x: rc = %d\n", + osd_ino2name(inode), blk, le16_to_cpu(head->iih_magic), + rc); brelse(bh); c->ic_idle_failed = 1; - return ERR_PTR(-EBADF); + return ERR_PTR(rc); } return bh;