* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
bh = __ldiskfs_bread(NULL, inode, blk, 0);
if (IS_ERR_OR_NULL(bh)) {
- CERROR("%.16s: cannot load idle blocks, blk = %u, err = %ld\n",
- LDISKFS_SB(inode->i_sb)->s_es->s_volume_name, blk,
- bh ? PTR_ERR(bh) : -EIO);
+ CERROR("%s: cannot load idle blocks, blk = %u, err = %ld\n",
+ osd_ino2name(inode), blk, bh ? PTR_ERR(bh) : -EIO);
c->ic_idle_failed = 1;
if (bh == NULL)
bh = ERR_PTR(-EIO);
head = (struct iam_idle_head *)(bh->b_data);
if (le16_to_cpu(head->iih_magic) != IAM_IDLE_HEADER_MAGIC) {
- CERROR("%.16s: invalid idle block head, blk = %u, magic = %d\n",
- LDISKFS_SB(inode->i_sb)->s_es->s_volume_name, blk,
- le16_to_cpu(head->iih_magic));
+ CERROR("%s: invalid idle block head, blk = %u, magic = %d\n",
+ osd_ino2name(inode), blk, le16_to_cpu(head->iih_magic));
brelse(bh);
c->ic_idle_failed = 1;
return ERR_PTR(-EBADF);
*/
static int iam_path_lookup(struct iam_path *path, int index)
{
- struct iam_container *c;
struct iam_leaf *leaf;
int result;
- c = path->ip_container;
leaf = &path->ip_leaf;
result = iam_lookup_lock(path, &leaf->il_lock, DLT_WRITE);
assert_inv(iam_path_check(path));
iam_ptr_t cursor;
struct dynlock_handle *lh[DX_MAX_TREE_HEIGHT] = { NULL, };
int result;
- struct inode *object;
/*
* Locking for iam_index_next()... is to be described.
*/
- object = c->ic_object;
cursor = path->ip_frame->leaf;
while (1) {
lh = iam_lock_htree(c, frame->curidx, DLT_WRITE);
if (lh == NULL) {
- CWARN("%.16s: No memory to recycle idle blocks\n",
- LDISKFS_SB(inode->i_sb)->s_es->s_volume_name);
+ CWARN("%s: No memory to recycle idle blocks\n",
+ osd_ino2name(inode));
return 0;
}
unlock:
mutex_unlock(&c->ic_idle_mutex);
if (rc != 0)
- CWARN("%.16s: idle blocks failed, will lose the blk %u\n",
- LDISKFS_SB(inode->i_sb)->s_es->s_volume_name, blk);
+ CWARN("%s: idle blocks failed, will lose the blk %u\n",
+ osd_ino2name(inode), blk);
}
/*