-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
/*
* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
obj = iam_leaf_container(l)->ic_object;
CERROR("Wrong magic in node %llu (#%lu): %#x != %#x or "
- "wrong used: %i",
+ "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);
assert_inv(n_invariant(l));
}
+static int lvar_rec_eq(const struct iam_leaf *l, const struct iam_rec *r)
+{
+ struct iam_rec *rec = e_rec(n_cur(l));
+
+ if (rec_size(rec) != rec_size(r))
+ return 0;
+ return !memcmp(rec, r, rec_size(r));
+}
+
static void lvar_rec_get(const struct iam_leaf *l, struct iam_rec *r)
{
struct iam_rec *rec;
assert_inv(n_invariant(leaf));
}
+static int lvar_leaf_empty(struct iam_leaf *leaf)
+{
+ return h_used(n_head(leaf)) == sizeof(struct lvar_leaf_header);
+}
+
static struct iam_leaf_operations lvar_leaf_ops = {
.init = lvar_init,
.init_new = lvar_init_new,
.key_eq = lvar_key_eq,
.key_size = lvar_key_size,
.rec_set = lvar_rec_set,
+ .rec_eq = lvar_rec_eq,
.rec_get = lvar_rec_get,
.lookup = lvar_lookup,
.ilookup = lvar_ilookup,
.rec_add = lvar_rec_add,
.rec_del = lvar_rec_del,
.can_add = lvar_can_add,
- .split = lvar_split
+ .split = lvar_split,
+ .leaf_empty = lvar_leaf_empty,
};
/*
sizeof (lvar_hash_t) + ptrsize)
};
- entry = root + 1;
- /*
- * Skip over @limit.
- */
- entry += isize;
+ /* To guarantee that the padding "keysize + ptrsize"
+ * covers the "dx_countlimit" and the "idle_blocks". */
+ LASSERT((keysize + ptrsize) >=
+ (sizeof(struct dx_countlimit) + sizeof(__u32)));
+
+ 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;
+
+ /*
+ * Skip over @limit.
+ */
+ entry = (void *)(root + 1) + isize;
/*
* Entry format is <key> followed by <ptr>. In the minimal tree
descr->id_node_gap = 0;
descr->id_ops = &lvar_ops;
descr->id_leaf_ops = &lvar_leaf_ops;
- } else
- result = -EBADF;
- brelse(bh);
- }
- return result;
+
+ c->ic_root_bh = bh;
+ } else {
+ result = -EBADF;
+ brelse(bh);
+ }
+ }
+ return result;
}
static struct iam_format lvar_format = {