X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_iam_lvar.c;h=0092a8eb6bb57b57df2db4fd666d49002ebe29f7;hb=7aaa680b7f22e7dfaac8af38b78d89164a94e842;hp=9fc9fd7d0d00cc46974734de060dc84b9752eb5e;hpb=7cbd1b0c7409b4bfb44dc6869afc4ff9c90a7dce;p=fs%2Flustre-release.git diff --git a/lustre/osd-ldiskfs/osd_iam_lvar.c b/lustre/osd-ldiskfs/osd_iam_lvar.c index 9fc9fd7..0092a8e 100644 --- a/lustre/osd-ldiskfs/osd_iam_lvar.c +++ b/lustre/osd-ldiskfs/osd_iam_lvar.c @@ -27,7 +27,7 @@ * 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, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -200,14 +200,14 @@ static __u32 hash_build0(const char *name, int namelen) struct ldiskfs_dx_hash_info hinfo; hinfo.hash_version = LDISKFS_DX_HASH_TEA; - hinfo.seed = 0; + hinfo.seed = NULL; ldiskfsfs_dirhash(name, namelen, &hinfo); result = hinfo.hash; if (LVAR_HASH_SANDWICH) { __u32 result2; hinfo.hash_version = LDISKFS_DX_HASH_TEA; - hinfo.seed = 0; + hinfo.seed = NULL; ldiskfsfs_dirhash(name, namelen, &hinfo); result2 = hinfo.hash; result = (0xfc000000 & result2) | (0x03ffffff & result); @@ -289,11 +289,11 @@ static struct lvar_leaf_entry *n_cur(const struct iam_leaf *l) 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 @@ -399,7 +399,7 @@ static int lvar_init(struct iam_leaf *l) 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; @@ -407,12 +407,12 @@ static int lvar_init(struct iam_leaf *l) struct inode *obj; obj = iam_leaf_container(l)->ic_object; - 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), - used); - result = -EIO; + CERROR("Wrong magic in node %llu (#%lu): %#x != %#x or " + "wrong used: %d\n", + (unsigned long long)l->il_bh->b_blocknr, obj->i_ino, + le16_to_cpu(head->vlh_magic), IAM_LVAR_LEAF_MAGIC, + used); + result = -EIO; } return result; } @@ -422,7 +422,7 @@ static void lvar_fini(struct iam_leaf *l) l->il_entries = l->il_at = NULL; } -struct iam_rec *lvar_rec(const struct iam_leaf *l) +static struct iam_rec *lvar_rec(const struct iam_leaf *l) { assert_corr(n_at_rec(l)); return e_rec(n_cur(l)); @@ -862,7 +862,7 @@ static int lvar_node_check(struct iam_path *path, struct iam_frame *frame) 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 @@ -949,18 +949,17 @@ static void lvar_root(void *buf, LASSERT((keysize + ptrsize) >= (sizeof(struct dx_countlimit) + sizeof(__u32))); - entry = limit + 1; + entry = (void *)(limit + 1); /* Put "idle_blocks" just after the limit. There was padding after * the limit, the "idle_blocks" re-uses part of the padding, so no * compatibility issues with old layout. */ *(__u32 *)entry = 0; - entry = root + 1; - /* - * Skip over @limit. - */ - entry += isize; + /* + * Skip over @limit. + */ + entry = (void *)(root + 1) + isize; /* * Entry format is followed by . In the minimal tree @@ -1011,22 +1010,23 @@ int iam_lvar_create(struct inode *obj, 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); ldiskfs_mark_inode_dirty(handle, obj); - result = ldiskfs_journal_dirty_metadata(handle, root_node); - if (result == 0) - result = ldiskfs_journal_dirty_metadata(handle, leaf_node); + result = ldiskfs_handle_dirty_metadata(handle, NULL, root_node); + if (result == 0) + result = ldiskfs_handle_dirty_metadata(handle, NULL, + leaf_node); if (result != 0) ldiskfs_std_error(sb, result); } @@ -1034,7 +1034,6 @@ int iam_lvar_create(struct inode *obj, brelse(root_node); return result; } -EXPORT_SYMBOL(iam_lvar_create); static struct iam_operations lvar_ops = { .id_root_ptr = lvar_root_ptr, @@ -1060,7 +1059,7 @@ static int lvar_guess(struct iam_container *c) 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;