* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
void n_print(const struct iam_leaf *l)
{
- struct lvar_leaf_entry *scan;
+ struct lvar_leaf_entry *scan;
- printk(CFS_KERN_EMERG "used: %d\n", h_used(n_head(l)));
- for (scan = n_start(l); scan < n_end(l); scan = e_next(l, scan))
- e_print(scan);
+ printk(KERN_EMERG "used: %d\n", h_used(n_head(l)));
+ for (scan = n_start(l); scan < n_end(l); scan = e_next(l, scan))
+ e_print(scan);
}
#if LDISKFS_CORRECTNESS_ON
head = n_head(l);
used = h_used(head);
- if (head->vlh_magic == le16_to_cpu(IAM_LVAR_LEAF_MAGIC) &&
+ if (le16_to_cpu(head->vlh_magic) == IAM_LVAR_LEAF_MAGIC &&
used <= blocksize(l)) {
l->il_at = l->il_entries = lvar_lentry(n_start(l));
result = 0;
CERROR("Wrong magic in node %llu (#%lu): %#x != %#x or "
"wrong used: %d",
(unsigned long long)l->il_bh->b_blocknr, obj->i_ino,
- head->vlh_magic, le16_to_cpu(IAM_LVAR_LEAF_MAGIC),
+ le16_to_cpu(head->vlh_magic), IAM_LVAR_LEAF_MAGIC,
used);
result = -EIO;
}
struct lvar_root *root;
root = (void *)frame->bh->b_data;
- if (le64_to_cpu(root->vr_magic) != IAM_LVAR_ROOT_MAGIC)
+ if (le32_to_cpu(root->vr_magic) != IAM_LVAR_ROOT_MAGIC)
return -EIO;
limit_correct = dx_root_limit(path);
} else
struct super_block *sb;
u32 blknr;
- int result;
+ int result = 0;
unsigned long bsize;
assert_corr(obj->i_size == 0);
sb = obj->i_sb;
bsize = sb->s_blocksize;
- root_node = ldiskfs_append(handle, obj, &blknr, &result);
- leaf_node = ldiskfs_append(handle, obj, &blknr, &result);
+ root_node = osd_ldiskfs_append(handle, obj, &blknr, &result);
+ leaf_node = osd_ldiskfs_append(handle, obj, &blknr, &result);
if (root_node != NULL && leaf_node != NULL) {
lvar_root(root_node->b_data, bsize, keysize, ptrsize, recsize);
lvar_leaf(leaf_node->b_data, bsize, keysize, ptrsize, recsize);
result = iam_node_read(c, lvar_root_ptr(c), NULL, &bh);
if (result == 0) {
root = (void *)bh->b_data;
- if (le64_to_cpu(root->vr_magic) == IAM_LVAR_ROOT_MAGIC) {
+ if (le32_to_cpu(root->vr_magic) == IAM_LVAR_ROOT_MAGIC) {
struct iam_descr *descr;
descr = c->ic_descr;