X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_iam.c;h=a699f02be86ed10e8679fcffaa1ae7df9bc07160;hb=31170f9ceca91684ea66e0b16757881563a8cf26;hp=eafe4949ae57b0275c8a347e0995186e3fa6137e;hpb=b1ff338ede34421acfc2cdbfe0dbe7b293ebd3b2;p=fs%2Flustre-release.git diff --git a/lustre/osd-ldiskfs/osd_iam.c b/lustre/osd-ldiskfs/osd_iam.c index eafe494..a699f02 100644 --- a/lustre/osd-ldiskfs/osd_iam.c +++ b/lustre/osd-ldiskfs/osd_iam.c @@ -23,7 +23,7 @@ * 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, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -157,7 +157,7 @@ * * No locking. Callers synchronize. */ -static struct list_head iam_formats = LIST_HEAD_INIT(iam_formats); +static LIST_HEAD(iam_formats); void iam_format_register(struct iam_format *fmt) { @@ -178,9 +178,8 @@ 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("%.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); @@ -189,9 +188,8 @@ 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("%.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); @@ -206,28 +204,28 @@ iam_load_idle_blocks(struct iam_container *c, iam_ptr_t blk) */ static int iam_format_guess(struct iam_container *c) { - int result; - struct iam_format *fmt; - - /* - * XXX temporary initialization hook. - */ - { - static int initialized = 0; - - if (!initialized) { - iam_lvar_format_init(); - iam_lfix_format_init(); - initialized = 1; - } - } + int result; + struct iam_format *fmt; + + /* + * XXX temporary initialization hook. + */ + { + static int initialized = 0; + + if (!initialized) { + iam_lvar_format_init(); + iam_lfix_format_init(); + initialized = 1; + } + } - result = -ENOENT; + result = -ENOENT; list_for_each_entry(fmt, &iam_formats, if_linkage) { - result = fmt->if_guess(c); - if (result == 0) - break; - } + result = fmt->if_guess(c); + if (result == 0) + break; + } if (result == 0) { struct buffer_head *bh; @@ -257,7 +255,7 @@ int iam_container_init(struct iam_container *c, struct iam_descr *descr, struct inode *inode) { memset(c, 0, sizeof *c); - c->ic_descr = descr; + c->ic_descr = descr; c->ic_object = inode; init_rwsem(&c->ic_sem); dynlock_init(&c->ic_tree_lock); @@ -270,7 +268,7 @@ int iam_container_init(struct iam_container *c, */ int iam_container_setup(struct iam_container *c) { - return iam_format_guess(c); + return iam_format_guess(c); } /* @@ -287,50 +285,50 @@ void iam_container_fini(struct iam_container *c) void iam_path_init(struct iam_path *path, struct iam_container *c, struct iam_path_descr *pd) { - memset(path, 0, sizeof *path); - path->ip_container = c; - path->ip_frame = path->ip_frames; - path->ip_data = pd; - path->ip_leaf.il_path = path; + memset(path, 0, sizeof *path); + path->ip_container = c; + path->ip_frame = path->ip_frames; + path->ip_data = pd; + path->ip_leaf.il_path = path; } static void iam_leaf_fini(struct iam_leaf *leaf); void iam_path_release(struct iam_path *path) { - int i; + int i; - for (i = 0; i < ARRAY_SIZE(path->ip_frames); i++) { - if (path->ip_frames[i].bh != NULL) { + for (i = 0; i < ARRAY_SIZE(path->ip_frames); i++) { + if (path->ip_frames[i].bh != NULL) { path->ip_frames[i].at_shifted = 0; - brelse(path->ip_frames[i].bh); - path->ip_frames[i].bh = NULL; - } - } + brelse(path->ip_frames[i].bh); + path->ip_frames[i].bh = NULL; + } + } } void iam_path_fini(struct iam_path *path) { - iam_leaf_fini(&path->ip_leaf); - iam_path_release(path); + iam_leaf_fini(&path->ip_leaf); + iam_path_release(path); } void iam_path_compat_init(struct iam_path_compat *path, struct inode *inode) { - int i; + int i; - path->ipc_hinfo = &path->ipc_hinfo_area; - for (i = 0; i < ARRAY_SIZE(path->ipc_scratch); ++i) - path->ipc_descr.ipd_key_scratch[i] = - (struct iam_ikey *)&path->ipc_scratch[i]; + path->ipc_hinfo = &path->ipc_hinfo_area; + for (i = 0; i < ARRAY_SIZE(path->ipc_scratch); ++i) + path->ipc_descr.ipd_key_scratch[i] = + (struct iam_ikey *)&path->ipc_scratch[i]; - iam_path_init(&path->ipc_path, &path->ipc_container, &path->ipc_descr); + iam_path_init(&path->ipc_path, &path->ipc_container, &path->ipc_descr); } void iam_path_compat_fini(struct iam_path_compat *path) { - iam_path_fini(&path->ipc_path); + iam_path_fini(&path->ipc_path); } /* @@ -338,15 +336,15 @@ void iam_path_compat_fini(struct iam_path_compat *path) */ struct iam_path_descr *iam_ipd_alloc(void *area, int keysize) { - struct iam_path_descr *ipd; - void *karea; - int i; + struct iam_path_descr *ipd; + void *karea; + int i; - ipd = area; - karea = ipd + 1; - for (i = 0; i < ARRAY_SIZE(ipd->ipd_key_scratch); ++i, karea += keysize) - ipd->ipd_key_scratch[i] = karea; - return ipd; + ipd = area; + karea = ipd + 1; + for (i = 0; i < ARRAY_SIZE(ipd->ipd_key_scratch); ++i, karea += keysize) + ipd->ipd_key_scratch[i] = karea; + return ipd; } void iam_ipd_free(struct iam_path_descr *ipd) @@ -356,17 +354,18 @@ void iam_ipd_free(struct iam_path_descr *ipd) int iam_node_read(struct iam_container *c, iam_ptr_t ptr, handle_t *h, struct buffer_head **bh) { - /* NB: it can be called by iam_lfix_guess() which is still at - * very early stage, c->ic_root_bh and c->ic_descr->id_ops - * haven't been intialized yet. - * Also, we don't have this for IAM dir. - */ - if (c->ic_root_bh != NULL && - c->ic_descr->id_ops->id_root_ptr(c) == ptr) { - get_bh(c->ic_root_bh); - *bh = c->ic_root_bh; - return 0; - } + /* + * NB: it can be called by iam_lfix_guess() which is still at + * very early stage, c->ic_root_bh and c->ic_descr->id_ops + * haven't been intialized yet. + * Also, we don't have this for IAM dir. + */ + if (c->ic_root_bh != NULL && + c->ic_descr->id_ops->id_root_ptr(c) == ptr) { + get_bh(c->ic_root_bh); + *bh = c->ic_root_bh; + return 0; + } *bh = __ldiskfs_bread(h, c->ic_object, (int)ptr, 0); if (IS_ERR(*bh)) @@ -384,7 +383,7 @@ int iam_node_read(struct iam_container *c, iam_ptr_t ptr, */ static struct iam_rec *iam_leaf_rec(const struct iam_leaf *leaf) { - return iam_leaf_ops(leaf)->rec(leaf); + return iam_leaf_ops(leaf)->rec(leaf); } /* @@ -396,35 +395,33 @@ static struct iam_rec *iam_leaf_rec(const struct iam_leaf *leaf) */ static struct iam_key *iam_leaf_key(const struct iam_leaf *leaf) { - return iam_leaf_ops(leaf)->key(leaf); + return iam_leaf_ops(leaf)->key(leaf); } static int iam_leaf_key_size(const struct iam_leaf *leaf) { - return iam_leaf_ops(leaf)->key_size(leaf); + return iam_leaf_ops(leaf)->key_size(leaf); } static struct iam_ikey *iam_leaf_ikey(const struct iam_leaf *leaf, struct iam_ikey *key) { - return iam_leaf_ops(leaf)->ikey(leaf, key); + return iam_leaf_ops(leaf)->ikey(leaf, key); } static int iam_leaf_keycmp(const struct iam_leaf *leaf, const struct iam_key *key) { - return iam_leaf_ops(leaf)->key_cmp(leaf, key); + return iam_leaf_ops(leaf)->key_cmp(leaf, key); } static int iam_leaf_keyeq(const struct iam_leaf *leaf, const struct iam_key *key) { - return iam_leaf_ops(leaf)->key_eq(leaf, key); + return iam_leaf_ops(leaf)->key_eq(leaf, key); } #if LDISKFS_INVARIANT_ON -extern int dx_node_check(struct iam_path *p, struct iam_frame *f); - static int iam_path_check(struct iam_path *p) { int i; @@ -456,9 +453,9 @@ static int iam_leaf_load(struct iam_path *path) iam_ptr_t block; int err; struct iam_container *c; - struct buffer_head *bh; - struct iam_leaf *leaf; - struct iam_descr *descr; + struct buffer_head *bh; + struct iam_leaf *leaf; + struct iam_descr *descr; c = path->ip_container; leaf = &path->ip_leaf; @@ -491,57 +488,57 @@ static void iam_unlock_htree(struct iam_container *ic, static void iam_leaf_unlock(struct iam_leaf *leaf) { - if (leaf->il_lock != NULL) { + if (leaf->il_lock != NULL) { iam_unlock_htree(iam_leaf_container(leaf), leaf->il_lock); do_corr(schedule()); leaf->il_lock = NULL; - } + } } static void iam_leaf_fini(struct iam_leaf *leaf) { - if (leaf->il_path != NULL) { - iam_leaf_unlock(leaf); - iam_leaf_ops(leaf)->fini(leaf); - if (leaf->il_bh) { - brelse(leaf->il_bh); - leaf->il_bh = NULL; - leaf->il_curidx = 0; - } - } + if (leaf->il_path != NULL) { + iam_leaf_unlock(leaf); + iam_leaf_ops(leaf)->fini(leaf); + if (leaf->il_bh) { + brelse(leaf->il_bh); + leaf->il_bh = NULL; + leaf->il_curidx = 0; + } + } } static void iam_leaf_start(struct iam_leaf *folio) { - iam_leaf_ops(folio)->start(folio); + iam_leaf_ops(folio)->start(folio); } void iam_leaf_next(struct iam_leaf *folio) { - iam_leaf_ops(folio)->next(folio); + iam_leaf_ops(folio)->next(folio); } static void iam_leaf_rec_add(struct iam_leaf *leaf, const struct iam_key *key, const struct iam_rec *rec) { - iam_leaf_ops(leaf)->rec_add(leaf, key, rec); + iam_leaf_ops(leaf)->rec_add(leaf, key, rec); } static void iam_rec_del(struct iam_leaf *leaf, int shift) { - iam_leaf_ops(leaf)->rec_del(leaf, shift); + iam_leaf_ops(leaf)->rec_del(leaf, shift); } int iam_leaf_at_end(const struct iam_leaf *leaf) { - return iam_leaf_ops(leaf)->at_end(leaf); + return iam_leaf_ops(leaf)->at_end(leaf); } static void iam_leaf_split(struct iam_leaf *l, struct buffer_head **bh, iam_ptr_t nr) { - iam_leaf_ops(l)->split(l, bh, nr); + iam_leaf_ops(l)->split(l, bh, nr); } static inline int iam_leaf_empty(struct iam_leaf *l) @@ -552,29 +549,29 @@ static inline int iam_leaf_empty(struct iam_leaf *l) int iam_leaf_can_add(const struct iam_leaf *l, const struct iam_key *k, const struct iam_rec *r) { - return iam_leaf_ops(l)->can_add(l, k, r); + return iam_leaf_ops(l)->can_add(l, k, r); } static int iam_txn_dirty(handle_t *handle, struct iam_path *path, struct buffer_head *bh) { - int result; + int result; result = ldiskfs_handle_dirty_metadata(handle, NULL, bh); - if (result != 0) - ldiskfs_std_error(iam_path_obj(path)->i_sb, result); - return result; + if (result != 0) + ldiskfs_std_error(iam_path_obj(path)->i_sb, result); + return result; } static int iam_txn_add(handle_t *handle, struct iam_path *path, struct buffer_head *bh) { - int result; + int result; - result = ldiskfs_journal_get_write_access(handle, bh); - if (result != 0) - ldiskfs_std_error(iam_path_obj(path)->i_sb, result); - return result; + result = ldiskfs_journal_get_write_access(handle, bh); + if (result != 0) + ldiskfs_std_error(iam_path_obj(path)->i_sb, result); + return result; } /***********************************************************************/ @@ -583,7 +580,7 @@ static int iam_txn_add(handle_t *handle, static enum iam_it_state it_state(const struct iam_iterator *it) { - return it->ii_state; + return it->ii_state; } /* @@ -591,36 +588,36 @@ static enum iam_it_state it_state(const struct iam_iterator *it) */ static struct iam_container *iam_it_container(const struct iam_iterator *it) { - return it->ii_path.ip_container; + return it->ii_path.ip_container; } static inline int it_keycmp(const struct iam_iterator *it, const struct iam_key *k) { - return iam_leaf_keycmp(&it->ii_path.ip_leaf, k); + return iam_leaf_keycmp(&it->ii_path.ip_leaf, k); } static inline int it_keyeq(const struct iam_iterator *it, const struct iam_key *k) { - return iam_leaf_keyeq(&it->ii_path.ip_leaf, k); + return iam_leaf_keyeq(&it->ii_path.ip_leaf, k); } static int it_ikeycmp(const struct iam_iterator *it, const struct iam_ikey *ik) { - return iam_ikeycmp(it->ii_path.ip_container, - iam_leaf_ikey(&it->ii_path.ip_leaf, - iam_path_ikey(&it->ii_path, 0)), ik); + return iam_ikeycmp(it->ii_path.ip_container, + iam_leaf_ikey(&it->ii_path.ip_leaf, + iam_path_ikey(&it->ii_path, 0)), ik); } static inline int it_at_rec(const struct iam_iterator *it) { - return !iam_leaf_at_end(&it->ii_path.ip_leaf); + return !iam_leaf_at_end(&it->ii_path.ip_leaf); } static inline int it_before(const struct iam_iterator *it) { - return it_state(it) == IAM_IT_SKEWED && it_at_rec(it); + return it_state(it) == IAM_IT_SKEWED && it_at_rec(it); } /* @@ -629,21 +626,21 @@ static inline int it_before(const struct iam_iterator *it) */ static int iam_it_get_exact(struct iam_iterator *it, const struct iam_key *k) { - int result; + int result; - result = iam_it_get(it, k); - if (result > 0) - result = 0; - else if (result == 0) - /* - * Return -ENOENT if cursor is located above record with a key - * different from one specified, or in the empty leaf. - * - * XXX returning -ENOENT only works if iam_it_get() never - * returns -ENOENT as a legitimate error. - */ - result = -ENOENT; - return result; + result = iam_it_get(it, k); + if (result > 0) + result = 0; + else if (result == 0) + /* + * Return -ENOENT if cursor is located above record with a key + * different from one specified, or in the empty leaf. + * + * XXX returning -ENOENT only works if iam_it_get() never + * returns -ENOENT as a legitimate error. + */ + result = -ENOENT; + return result; } void iam_container_write_lock(struct iam_container *ic) @@ -674,11 +671,11 @@ void iam_container_read_unlock(struct iam_container *ic) int iam_it_init(struct iam_iterator *it, struct iam_container *c, __u32 flags, struct iam_path_descr *pd) { - memset(it, 0, sizeof *it); - it->ii_flags = flags; - it->ii_state = IAM_IT_DETACHED; - iam_path_init(&it->ii_path, c, pd); - return 0; + memset(it, 0, sizeof *it); + it->ii_flags = flags; + it->ii_state = IAM_IT_DETACHED; + iam_path_init(&it->ii_path, c, pd); + return 0; } /* @@ -688,8 +685,8 @@ int iam_it_init(struct iam_iterator *it, struct iam_container *c, __u32 flags, */ void iam_it_fini(struct iam_iterator *it) { - assert_corr(it_state(it) == IAM_IT_DETACHED); - iam_path_fini(&it->ii_path); + assert_corr(it_state(it) == IAM_IT_DETACHED); + iam_path_fini(&it->ii_path); } /* @@ -705,7 +702,7 @@ static struct dynlock_handle *iam_lock_htree(struct iam_container *ic, static int iam_index_lock(struct iam_path *path, struct dynlock_handle **lh) { - struct iam_frame *f; + struct iam_frame *f; for (f = path->ip_frame; f >= path->ip_frames; --f, ++lh) { do_corr(schedule()); @@ -721,39 +718,39 @@ static int iam_index_lock(struct iam_path *path, struct dynlock_handle **lh) */ static int iam_check_fast(struct iam_path *path, struct iam_frame *frame) { - struct iam_container *bag; - struct iam_entry *next; - struct iam_entry *last; - struct iam_entry *entries; - struct iam_entry *at; + struct iam_container *bag; + struct iam_entry *next; + struct iam_entry *last; + struct iam_entry *entries; + struct iam_entry *at; - bag = path->ip_container; - at = frame->at; - entries = frame->entries; - last = iam_entry_shift(path, entries, dx_get_count(entries) - 1); + bag = path->ip_container; + at = frame->at; + entries = frame->entries; + last = iam_entry_shift(path, entries, dx_get_count(entries) - 1); - if (unlikely(at > last)) - return -EAGAIN; + if (unlikely(at > last)) + return -EAGAIN; - if (unlikely(dx_get_block(path, at) != frame->leaf)) - return -EAGAIN; + if (unlikely(dx_get_block(path, at) != frame->leaf)) + return -EAGAIN; - if (unlikely(iam_ikeycmp(bag, iam_ikey_at(path, at), - path->ip_ikey_target) > 0)) - return -EAGAIN; + if (unlikely(iam_ikeycmp(bag, iam_ikey_at(path, at), + path->ip_ikey_target) > 0)) + return -EAGAIN; - next = iam_entry_shift(path, at, +1); - if (next <= last) { - if (unlikely(iam_ikeycmp(bag, iam_ikey_at(path, next), - path->ip_ikey_target) <= 0)) - return -EAGAIN; - } - return 0; + next = iam_entry_shift(path, at, +1); + if (next <= last) { + if (unlikely(iam_ikeycmp(bag, iam_ikey_at(path, next), + path->ip_ikey_target) <= 0)) + return -EAGAIN; + } + return 0; } int dx_index_is_compat(struct iam_path *path) { - return iam_path_descr(path) == NULL; + return iam_path_descr(path) == NULL; } /* @@ -766,162 +763,162 @@ int dx_index_is_compat(struct iam_path *path) static struct iam_entry *iam_find_position(struct iam_path *path, struct iam_frame *frame) { - int count; - struct iam_entry *p; - struct iam_entry *q; - struct iam_entry *m; - - count = dx_get_count(frame->entries); - assert_corr(count && count <= dx_get_limit(frame->entries)); - p = iam_entry_shift(path, frame->entries, - dx_index_is_compat(path) ? 1 : 2); - q = iam_entry_shift(path, frame->entries, count - 1); - while (p <= q) { - m = iam_entry_shift(path, p, iam_entry_diff(path, q, p) / 2); - if (iam_ikeycmp(path->ip_container, iam_ikey_at(path, m), - path->ip_ikey_target) > 0) - q = iam_entry_shift(path, m, -1); - else - p = iam_entry_shift(path, m, +1); - } - return iam_entry_shift(path, p, -1); + int count; + struct iam_entry *p; + struct iam_entry *q; + struct iam_entry *m; + + count = dx_get_count(frame->entries); + assert_corr(count && count <= dx_get_limit(frame->entries)); + p = iam_entry_shift(path, frame->entries, + dx_index_is_compat(path) ? 1 : 2); + q = iam_entry_shift(path, frame->entries, count - 1); + while (p <= q) { + m = iam_entry_shift(path, p, iam_entry_diff(path, q, p) / 2); + if (iam_ikeycmp(path->ip_container, iam_ikey_at(path, m), + path->ip_ikey_target) > 0) + q = iam_entry_shift(path, m, -1); + else + p = iam_entry_shift(path, m, +1); + } + return iam_entry_shift(path, p, -1); } static iam_ptr_t iam_find_ptr(struct iam_path *path, struct iam_frame *frame) { - return dx_get_block(path, iam_find_position(path, frame)); + return dx_get_block(path, iam_find_position(path, frame)); } void iam_insert_key(struct iam_path *path, struct iam_frame *frame, const struct iam_ikey *key, iam_ptr_t ptr) { - struct iam_entry *entries = frame->entries; - struct iam_entry *new = iam_entry_shift(path, frame->at, +1); - int count = dx_get_count(entries); + struct iam_entry *entries = frame->entries; + struct iam_entry *new = iam_entry_shift(path, frame->at, +1); + int count = dx_get_count(entries); - /* - * Unfortunately we cannot assert this, as this function is sometimes - * called by VFS under i_sem and without pdirops lock. - */ - assert_corr(1 || iam_frame_is_locked(path, frame)); - assert_corr(count < dx_get_limit(entries)); - assert_corr(frame->at < iam_entry_shift(path, entries, count)); - assert_inv(dx_node_check(path, frame)); + /* + * Unfortunately we cannot assert this, as this function is sometimes + * called by VFS under i_sem and without pdirops lock. + */ + assert_corr(1 || iam_frame_is_locked(path, frame)); + assert_corr(count < dx_get_limit(entries)); + assert_corr(frame->at < iam_entry_shift(path, entries, count)); + assert_inv(dx_node_check(path, frame)); - memmove(iam_entry_shift(path, new, 1), new, - (char *)iam_entry_shift(path, entries, count) - (char *)new); - dx_set_ikey(path, new, key); - dx_set_block(path, new, ptr); - dx_set_count(entries, count + 1); - assert_inv(dx_node_check(path, frame)); + memmove(iam_entry_shift(path, new, 1), new, + (char *)iam_entry_shift(path, entries, count) - (char *)new); + dx_set_ikey(path, new, key); + dx_set_block(path, new, ptr); + dx_set_count(entries, count + 1); + assert_inv(dx_node_check(path, frame)); } void iam_insert_key_lock(struct iam_path *path, struct iam_frame *frame, const struct iam_ikey *key, iam_ptr_t ptr) { - iam_lock_bh(frame->bh); - iam_insert_key(path, frame, key, ptr); - iam_unlock_bh(frame->bh); + iam_lock_bh(frame->bh); + iam_insert_key(path, frame, key, ptr); + iam_unlock_bh(frame->bh); } /* * returns 0 if path was unchanged, -EAGAIN otherwise. */ static int iam_check_path(struct iam_path *path, struct iam_frame *frame) { - int equal; + int equal; - iam_lock_bh(frame->bh); - equal = iam_check_fast(path, frame) == 0 || - frame->leaf == iam_find_ptr(path, frame); - DX_DEVAL(iam_lock_stats.dls_bh_again += !equal); - iam_unlock_bh(frame->bh); + iam_lock_bh(frame->bh); + equal = iam_check_fast(path, frame) == 0 || + frame->leaf == iam_find_ptr(path, frame); + DX_DEVAL(iam_lock_stats.dls_bh_again += !equal); + iam_unlock_bh(frame->bh); - return equal ? 0 : -EAGAIN; + return equal ? 0 : -EAGAIN; } static int iam_lookup_try(struct iam_path *path) { - u32 ptr; - int err = 0; - int i; - - struct iam_descr *param; - struct iam_frame *frame; - struct iam_container *c; - - param = iam_path_descr(path); - c = path->ip_container; - - ptr = param->id_ops->id_root_ptr(c); - for (frame = path->ip_frames, i = 0; i <= path->ip_indirect; - ++frame, ++i) { - err = param->id_ops->id_node_read(c, (iam_ptr_t)ptr, NULL, - &frame->bh); - do_corr(schedule()); - - iam_lock_bh(frame->bh); - /* - * node must be initialized under bh lock because concurrent - * creation procedure may change it and iam_lookup_try() will - * see obsolete tree height. -bzzz - */ - if (err != 0) - break; - - if (LDISKFS_INVARIANT_ON) { - err = param->id_ops->id_node_check(path, frame); - if (err != 0) - break; - } - - err = param->id_ops->id_node_load(path, frame); - if (err != 0) - break; - - assert_inv(dx_node_check(path, frame)); - /* - * splitting may change root index block and move hash we're - * looking for into another index block so, we have to check - * this situation and repeat from begining if path got changed - * -bzzz - */ - if (i > 0) { - err = iam_check_path(path, frame - 1); - if (err != 0) - break; - } - - frame->at = iam_find_position(path, frame); - frame->curidx = ptr; - frame->leaf = ptr = dx_get_block(path, frame->at); - - iam_unlock_bh(frame->bh); - do_corr(schedule()); - } - if (err != 0) - iam_unlock_bh(frame->bh); - path->ip_frame = --frame; - return err; + u32 ptr; + int err = 0; + int i; + + struct iam_descr *param; + struct iam_frame *frame; + struct iam_container *c; + + param = iam_path_descr(path); + c = path->ip_container; + + ptr = param->id_ops->id_root_ptr(c); + for (frame = path->ip_frames, i = 0; i <= path->ip_indirect; + ++frame, ++i) { + err = param->id_ops->id_node_read(c, (iam_ptr_t)ptr, NULL, + &frame->bh); + do_corr(schedule()); + + iam_lock_bh(frame->bh); + /* + * node must be initialized under bh lock because concurrent + * creation procedure may change it and iam_lookup_try() will + * see obsolete tree height. -bzzz + */ + if (err != 0) + break; + + if (LDISKFS_INVARIANT_ON) { + err = param->id_ops->id_node_check(path, frame); + if (err != 0) + break; + } + + err = param->id_ops->id_node_load(path, frame); + if (err != 0) + break; + + assert_inv(dx_node_check(path, frame)); + /* + * splitting may change root index block and move hash we're + * looking for into another index block so, we have to check + * this situation and repeat from begining if path got changed + * -bzzz + */ + if (i > 0) { + err = iam_check_path(path, frame - 1); + if (err != 0) + break; + } + + frame->at = iam_find_position(path, frame); + frame->curidx = ptr; + frame->leaf = ptr = dx_get_block(path, frame->at); + + iam_unlock_bh(frame->bh); + do_corr(schedule()); + } + if (err != 0) + iam_unlock_bh(frame->bh); + path->ip_frame = --frame; + return err; } static int __iam_path_lookup(struct iam_path *path) { - int err; - int i; + int err; + int i; - for (i = 0; i < DX_MAX_TREE_HEIGHT; ++ i) - assert(path->ip_frames[i].bh == NULL); + for (i = 0; i < DX_MAX_TREE_HEIGHT; ++ i) + assert(path->ip_frames[i].bh == NULL); - do { - err = iam_lookup_try(path); - do_corr(schedule()); - if (err != 0) - iam_path_fini(path); - } while (err == -EAGAIN); + do { + err = iam_lookup_try(path); + do_corr(schedule()); + if (err != 0) + iam_path_fini(path); + } while (err == -EAGAIN); - return err; + return err; } /* @@ -929,60 +926,60 @@ static int __iam_path_lookup(struct iam_path *path) */ static int iam_check_full_path(struct iam_path *path, int search) { - struct iam_frame *bottom; - struct iam_frame *scan; - int i; - int result; - - do_corr(schedule()); - - for (bottom = path->ip_frames, i = 0; - i < DX_MAX_TREE_HEIGHT && bottom->bh != NULL; ++bottom, ++i) { - ; /* find last filled in frame */ - } - - /* - * Lock frames, bottom to top. - */ - for (scan = bottom - 1; scan >= path->ip_frames; --scan) - iam_lock_bh(scan->bh); - /* - * Check them top to bottom. - */ - result = 0; - for (scan = path->ip_frames; scan < bottom; ++scan) { - struct iam_entry *pos; - - if (search) { - if (iam_check_fast(path, scan) == 0) - continue; - - pos = iam_find_position(path, scan); - if (scan->leaf != dx_get_block(path, pos)) { - result = -EAGAIN; - break; - } - scan->at = pos; - } else { - pos = iam_entry_shift(path, scan->entries, - dx_get_count(scan->entries) - 1); - if (scan->at > pos || - scan->leaf != dx_get_block(path, scan->at)) { - result = -EAGAIN; - break; - } - } - } - - /* - * Unlock top to bottom. - */ - for (scan = path->ip_frames; scan < bottom; ++scan) + struct iam_frame *bottom; + struct iam_frame *scan; + int i; + int result; + + do_corr(schedule()); + + for (bottom = path->ip_frames, i = 0; + i < DX_MAX_TREE_HEIGHT && bottom->bh != NULL; ++bottom, ++i) { + ; /* find last filled in frame */ + } + + /* + * Lock frames, bottom to top. + */ + for (scan = bottom - 1; scan >= path->ip_frames; --scan) + iam_lock_bh(scan->bh); + /* + * Check them top to bottom. + */ + result = 0; + for (scan = path->ip_frames; scan < bottom; ++scan) { + struct iam_entry *pos; + + if (search) { + if (iam_check_fast(path, scan) == 0) + continue; + + pos = iam_find_position(path, scan); + if (scan->leaf != dx_get_block(path, pos)) { + result = -EAGAIN; + break; + } + scan->at = pos; + } else { + pos = iam_entry_shift(path, scan->entries, + dx_get_count(scan->entries) - 1); + if (scan->at > pos || + scan->leaf != dx_get_block(path, scan->at)) { + result = -EAGAIN; + break; + } + } + } + + /* + * Unlock top to bottom. + */ + for (scan = path->ip_frames; scan < bottom; ++scan) iam_unlock_bh(scan->bh); - DX_DEVAL(iam_lock_stats.dls_bh_full_again += !!result); - do_corr(schedule()); + DX_DEVAL(iam_lock_stats.dls_bh_full_again += !!result); + do_corr(schedule()); - return result; + return result; } @@ -993,10 +990,10 @@ static int iam_check_full_path(struct iam_path *path, int search) static int iam_lookup_lock(struct iam_path *path, struct dynlock_handle **dl, enum dynlock_type lt) { - int result; + int result; - while ((result = __iam_path_lookup(path)) == 0) { - do_corr(schedule()); + while ((result = __iam_path_lookup(path)) == 0) { + do_corr(schedule()); *dl = iam_lock_htree(path->ip_container, path->ip_frame->leaf, lt); if (*dl == NULL) { @@ -1004,18 +1001,18 @@ static int iam_lookup_lock(struct iam_path *path, result = -ENOMEM; break; } - do_corr(schedule()); - /* - * while locking leaf we just found may get split so we need - * to check this -bzzz - */ - if (iam_check_full_path(path, 1) == 0) - break; + do_corr(schedule()); + /* + * while locking leaf we just found may get split so we need + * to check this -bzzz + */ + if (iam_check_full_path(path, 1) == 0) + break; iam_unlock_htree(path->ip_container, *dl); - *dl = NULL; - iam_path_fini(path); - } - return result; + *dl = NULL; + iam_path_fini(path); + } + return result; } /* * Performs tree top-to-bottom traversal starting from root, and loads leaf @@ -1023,29 +1020,29 @@ static int iam_lookup_lock(struct iam_path *path, */ static int iam_path_lookup(struct iam_path *path, int index) { - struct iam_leaf *leaf; - int result; - - leaf = &path->ip_leaf; - result = iam_lookup_lock(path, &leaf->il_lock, DLT_WRITE); - assert_inv(iam_path_check(path)); - do_corr(schedule()); - if (result == 0) { - result = iam_leaf_load(path); - if (result == 0) { - do_corr(schedule()); - if (index) - result = iam_leaf_ops(leaf)-> - ilookup(leaf, path->ip_ikey_target); - else - result = iam_leaf_ops(leaf)-> - lookup(leaf, path->ip_key_target); - do_corr(schedule()); - } - if (result < 0) - iam_leaf_unlock(leaf); - } - return result; + struct iam_leaf *leaf; + int result; + + leaf = &path->ip_leaf; + result = iam_lookup_lock(path, &leaf->il_lock, DLT_WRITE); + assert_inv(iam_path_check(path)); + do_corr(schedule()); + if (result == 0) { + result = iam_leaf_load(path); + if (result == 0) { + do_corr(schedule()); + if (index) + result = iam_leaf_ops(leaf)-> + ilookup(leaf, path->ip_ikey_target); + else + result = iam_leaf_ops(leaf)-> + lookup(leaf, path->ip_key_target); + do_corr(schedule()); + } + if (result < 0) + iam_leaf_unlock(leaf); + } + return result; } /* @@ -1053,38 +1050,39 @@ static int iam_path_lookup(struct iam_path *path, int index) */ static int __iam_it_get(struct iam_iterator *it, int index) { - int result; - assert_corr(it_state(it) == IAM_IT_DETACHED); - - result = iam_path_lookup(&it->ii_path, index); - if (result >= 0) { - int collision; - - collision = result & IAM_LOOKUP_LAST; - switch (result & ~IAM_LOOKUP_LAST) { - case IAM_LOOKUP_EXACT: - result = +1; - it->ii_state = IAM_IT_ATTACHED; - break; - case IAM_LOOKUP_OK: - result = 0; - it->ii_state = IAM_IT_ATTACHED; - break; - case IAM_LOOKUP_BEFORE: - case IAM_LOOKUP_EMPTY: - result = 0; - it->ii_state = IAM_IT_SKEWED; - break; - default: - assert(0); - } - result |= collision; - } - /* - * See iam_it_get_exact() for explanation. - */ - assert_corr(result != -ENOENT); - return result; + int result; + + assert_corr(it_state(it) == IAM_IT_DETACHED); + + result = iam_path_lookup(&it->ii_path, index); + if (result >= 0) { + int collision; + + collision = result & IAM_LOOKUP_LAST; + switch (result & ~IAM_LOOKUP_LAST) { + case IAM_LOOKUP_EXACT: + result = +1; + it->ii_state = IAM_IT_ATTACHED; + break; + case IAM_LOOKUP_OK: + result = 0; + it->ii_state = IAM_IT_ATTACHED; + break; + case IAM_LOOKUP_BEFORE: + case IAM_LOOKUP_EMPTY: + result = 0; + it->ii_state = IAM_IT_SKEWED; + break; + default: + assert(0); + } + result |= collision; + } + /* + * See iam_it_get_exact() for explanation. + */ + assert_corr(result != -ENOENT); + return result; } /* @@ -1093,18 +1091,18 @@ static int __iam_it_get(struct iam_iterator *it, int index) */ static int iam_it_collision(struct iam_iterator *it) { - int result; + int result; - assert(ergo(it_at_rec(it), !it_keyeq(it, it->ii_path.ip_key_target))); + assert(ergo(it_at_rec(it), !it_keyeq(it, it->ii_path.ip_key_target))); - while ((result = iam_it_next(it)) == 0) { - do_corr(schedule()); - if (it_ikeycmp(it, it->ii_path.ip_ikey_target) != 0) - return -ENOENT; - if (it_keyeq(it, it->ii_path.ip_key_target)) - return 0; - } - return result; + while ((result = iam_it_next(it)) == 0) { + do_corr(schedule()); + if (it_ikeycmp(it, it->ii_path.ip_ikey_target) != 0) + return -ENOENT; + if (it_keyeq(it, it->ii_path.ip_key_target)) + return 0; + } + return result; } /* @@ -1121,30 +1119,31 @@ static int iam_it_collision(struct iam_iterator *it) */ int iam_it_get(struct iam_iterator *it, const struct iam_key *k) { - int result; - assert_corr(it_state(it) == IAM_IT_DETACHED); + int result; - it->ii_path.ip_ikey_target = NULL; - it->ii_path.ip_key_target = k; + assert_corr(it_state(it) == IAM_IT_DETACHED); - result = __iam_it_get(it, 0); + it->ii_path.ip_ikey_target = NULL; + it->ii_path.ip_key_target = k; - if (result == IAM_LOOKUP_LAST) { - result = iam_it_collision(it); - if (result != 0) { - iam_it_put(it); - iam_it_fini(it); - result = __iam_it_get(it, 0); - } else - result = +1; - } - if (result > 0) - result &= ~IAM_LOOKUP_LAST; + result = __iam_it_get(it, 0); - assert_corr(ergo(result > 0, it_keycmp(it, k) == 0)); - assert_corr(ergo(result == 0 && it_state(it) == IAM_IT_ATTACHED, - it_keycmp(it, k) <= 0)); - return result; + if (result == IAM_LOOKUP_LAST) { + result = iam_it_collision(it); + if (result != 0) { + iam_it_put(it); + iam_it_fini(it); + result = __iam_it_get(it, 0); + } else + result = +1; + } + if (result > 0) + result &= ~IAM_LOOKUP_LAST; + + assert_corr(ergo(result > 0, it_keycmp(it, k) == 0)); + assert_corr(ergo(result == 0 && it_state(it) == IAM_IT_ATTACHED, + it_keycmp(it, k) <= 0)); + return result; } /* @@ -1152,10 +1151,10 @@ int iam_it_get(struct iam_iterator *it, const struct iam_key *k) */ static int iam_it_iget(struct iam_iterator *it, const struct iam_ikey *k) { - assert_corr(it_state(it) == IAM_IT_DETACHED); + assert_corr(it_state(it) == IAM_IT_DETACHED); - it->ii_path.ip_ikey_target = k; - return __iam_it_get(it, 1) & ~IAM_LOOKUP_LAST; + it->ii_path.ip_ikey_target = k; + return __iam_it_get(it, 1) & ~IAM_LOOKUP_LAST; } /* @@ -1171,18 +1170,19 @@ static int iam_it_iget(struct iam_iterator *it, const struct iam_ikey *k) */ int iam_it_get_at(struct iam_iterator *it, const struct iam_key *k) { - int result; - assert_corr(it_state(it) == IAM_IT_DETACHED && - !(it->ii_flags&IAM_IT_WRITE)); - result = iam_it_get(it, k); - if (result == 0) { - if (it_state(it) != IAM_IT_ATTACHED) { - assert_corr(it_state(it) == IAM_IT_SKEWED); - result = iam_it_next(it); - } - } - assert_corr(ergo(result >= 0, it_state(it) == IAM_IT_ATTACHED)); - return result; + int result; + + assert_corr(it_state(it) == IAM_IT_DETACHED && + !(it->ii_flags&IAM_IT_WRITE)); + result = iam_it_get(it, k); + if (result == 0) { + if (it_state(it) != IAM_IT_ATTACHED) { + assert_corr(it_state(it) == IAM_IT_SKEWED); + result = iam_it_next(it); + } + } + assert_corr(ergo(result >= 0, it_state(it) == IAM_IT_ATTACHED)); + return result; } /* @@ -1197,19 +1197,18 @@ int iam_it_get_at(struct iam_iterator *it, const struct iam_key *k) */ void iam_it_dup(struct iam_iterator *dst, const struct iam_iterator *src) { - dst->ii_flags = src->ii_flags; - dst->ii_state = src->ii_state; - /* XXX not yet. iam_path_dup(&dst->ii_path, &src->ii_path); */ - /* - * XXX: duplicate lock. - */ - assert_corr(it_state(dst) == it_state(src)); - assert_corr(iam_it_container(dst) == iam_it_container(src)); - assert_corr(dst->ii_flags = src->ii_flags); - assert_corr(ergo(it_state(src) == IAM_IT_ATTACHED, - iam_it_rec_get(dst) == iam_it_rec_get(src) && - iam_it_key_get(dst) == iam_it_key_get(src))); - + dst->ii_flags = src->ii_flags; + dst->ii_state = src->ii_state; + /* XXX not yet. iam_path_dup(&dst->ii_path, &src->ii_path); */ + /* + * XXX: duplicate lock. + */ + assert_corr(it_state(dst) == it_state(src)); + assert_corr(iam_it_container(dst) == iam_it_container(src)); + assert_corr(dst->ii_flags = src->ii_flags); + assert_corr(ergo(it_state(src) == IAM_IT_ATTACHED, + iam_it_rec_get(dst) == iam_it_rec_get(src) && + iam_it_key_get(dst) == iam_it_key_get(src))); } /* @@ -1219,10 +1218,10 @@ void iam_it_dup(struct iam_iterator *dst, const struct iam_iterator *src) */ void iam_it_put(struct iam_iterator *it) { - if (it->ii_state != IAM_IT_DETACHED) { - it->ii_state = IAM_IT_DETACHED; - iam_leaf_fini(&it->ii_path.ip_leaf); - } + if (it->ii_state != IAM_IT_DETACHED) { + it->ii_state = IAM_IT_DETACHED; + iam_leaf_fini(&it->ii_path.ip_leaf); + } } static struct iam_ikey *iam_it_ikey_get(const struct iam_iterator *it, @@ -1250,107 +1249,107 @@ static int iam_htree_advance(struct inode *dir, __u32 hash, struct iam_path *path, __u32 *start_hash, int compat) { - struct iam_frame *p; - struct buffer_head *bh; - int err, num_frames = 0; - __u32 bhash; - - p = path->ip_frame; - /* - * Find the next leaf page by incrementing the frame pointer. - * If we run out of entries in the interior node, loop around and - * increment pointer in the parent node. When we break out of - * this loop, num_frames indicates the number of interior - * nodes need to be read. - */ - while (1) { - do_corr(schedule()); - iam_lock_bh(p->bh); + struct iam_frame *p; + struct buffer_head *bh; + int err, num_frames = 0; + __u32 bhash; + + p = path->ip_frame; + /* + * Find the next leaf page by incrementing the frame pointer. + * If we run out of entries in the interior node, loop around and + * increment pointer in the parent node. When we break out of + * this loop, num_frames indicates the number of interior + * nodes need to be read. + */ + while (1) { + do_corr(schedule()); + iam_lock_bh(p->bh); if (p->at_shifted) p->at_shifted = 0; else p->at = iam_entry_shift(path, p->at, +1); - if (p->at < iam_entry_shift(path, p->entries, - dx_get_count(p->entries))) { - p->leaf = dx_get_block(path, p->at); - iam_unlock_bh(p->bh); - break; - } - iam_unlock_bh(p->bh); - if (p == path->ip_frames) - return 0; - num_frames++; - --p; - } - - if (compat) { - /* - * Htree hash magic. - */ - /* - * If the hash is 1, then continue only if the next page has a - * continuation hash of any value. This is used for readdir - * handling. Otherwise, check to see if the hash matches the - * desired contiuation hash. If it doesn't, return since - * there's no point to read in the successive index pages. - */ - dx_get_ikey(path, p->at, (struct iam_ikey *)&bhash); - if (start_hash) - *start_hash = bhash; - if ((hash & 1) == 0) { - if ((bhash & ~1) != hash) - return 0; - } - } - /* - * If the hash is HASH_NB_ALWAYS, we always go to the next - * block so no check is necessary - */ - while (num_frames--) { - iam_ptr_t idx; - - do_corr(schedule()); - iam_lock_bh(p->bh); - idx = p->leaf = dx_get_block(path, p->at); - iam_unlock_bh(p->bh); - err = iam_path_descr(path)->id_ops-> - id_node_read(path->ip_container, idx, NULL, &bh); - if (err != 0) - return err; /* Failure */ - ++p; - brelse(p->bh); - assert_corr(p->bh != bh); - p->bh = bh; - p->entries = dx_node_get_entries(path, p); - p->at = iam_entry_shift(path, p->entries, !compat); - assert_corr(p->curidx != idx); - p->curidx = idx; - iam_lock_bh(p->bh); - assert_corr(p->leaf != dx_get_block(path, p->at)); - p->leaf = dx_get_block(path, p->at); - iam_unlock_bh(p->bh); - assert_inv(dx_node_check(path, p)); - } - return 1; -} + if (p->at < iam_entry_shift(path, p->entries, + dx_get_count(p->entries))) { + p->leaf = dx_get_block(path, p->at); + iam_unlock_bh(p->bh); + break; + } + iam_unlock_bh(p->bh); + if (p == path->ip_frames) + return 0; + num_frames++; + --p; + } + if (compat) { + /* + * Htree hash magic. + */ + + /* + * If the hash is 1, then continue only if the next page has a + * continuation hash of any value. This is used for readdir + * handling. Otherwise, check to see if the hash matches the + * desired contiuation hash. If it doesn't, return since + * there's no point to read in the successive index pages. + */ + dx_get_ikey(path, p->at, (struct iam_ikey *)&bhash); + if (start_hash) + *start_hash = bhash; + if ((hash & 1) == 0) { + if ((bhash & ~1) != hash) + return 0; + } + } + /* + * If the hash is HASH_NB_ALWAYS, we always go to the next + * block so no check is necessary + */ + while (num_frames--) { + iam_ptr_t idx; + + do_corr(schedule()); + iam_lock_bh(p->bh); + idx = p->leaf = dx_get_block(path, p->at); + iam_unlock_bh(p->bh); + err = iam_path_descr(path)->id_ops-> + id_node_read(path->ip_container, idx, NULL, &bh); + if (err != 0) + return err; /* Failure */ + ++p; + brelse(p->bh); + assert_corr(p->bh != bh); + p->bh = bh; + p->entries = dx_node_get_entries(path, p); + p->at = iam_entry_shift(path, p->entries, !compat); + assert_corr(p->curidx != idx); + p->curidx = idx; + iam_lock_bh(p->bh); + assert_corr(p->leaf != dx_get_block(path, p->at)); + p->leaf = dx_get_block(path, p->at); + iam_unlock_bh(p->bh); + assert_inv(dx_node_check(path, p)); + } + return 1; +} static inline int iam_index_advance(struct iam_path *path) { - return iam_htree_advance(iam_path_obj(path), 0, path, NULL, 0); + return iam_htree_advance(iam_path_obj(path), 0, path, NULL, 0); } static void iam_unlock_array(struct iam_container *ic, struct dynlock_handle **lh) { - int i; + int i; - for (i = 0; i < DX_MAX_TREE_HEIGHT; ++i, ++lh) { + for (i = 0; i < DX_MAX_TREE_HEIGHT; ++i, ++lh) { if (*lh != NULL) { iam_unlock_htree(ic, *lh); *lh = NULL; } - } + } } /* * Advance index part of @path to point to the next leaf. Returns 1 on @@ -1358,71 +1357,71 @@ static void iam_unlock_array(struct iam_container *ic, */ int iam_index_next(struct iam_container *c, struct iam_path *path) { - iam_ptr_t cursor; + iam_ptr_t cursor; struct dynlock_handle *lh[DX_MAX_TREE_HEIGHT] = { NULL, }; - int result; + int result; - /* - * Locking for iam_index_next()... is to be described. - */ + /* + * Locking for iam_index_next()... is to be described. + */ - cursor = path->ip_frame->leaf; + cursor = path->ip_frame->leaf; - while (1) { - result = iam_index_lock(path, lh); - do_corr(schedule()); - if (result < 0) - break; + while (1) { + result = iam_index_lock(path, lh); + do_corr(schedule()); + if (result < 0) + break; - result = iam_check_full_path(path, 0); - if (result == 0 && cursor == path->ip_frame->leaf) { - result = iam_index_advance(path); + result = iam_check_full_path(path, 0); + if (result == 0 && cursor == path->ip_frame->leaf) { + result = iam_index_advance(path); - assert_corr(result == 0 || - cursor != path->ip_frame->leaf); - break; - } - do { + assert_corr(result == 0 || + cursor != path->ip_frame->leaf); + break; + } + do { iam_unlock_array(c, lh); - iam_path_release(path); - do_corr(schedule()); - - result = __iam_path_lookup(path); - if (result < 0) - break; - - while (path->ip_frame->leaf != cursor) { - do_corr(schedule()); - - result = iam_index_lock(path, lh); - do_corr(schedule()); - if (result < 0) - break; - - result = iam_check_full_path(path, 0); - if (result != 0) - break; - - result = iam_index_advance(path); - if (result == 0) { - CERROR("cannot find cursor : %u\n", - cursor); - result = -EIO; - } - if (result < 0) - break; - result = iam_check_full_path(path, 0); - if (result != 0) - break; + iam_path_release(path); + do_corr(schedule()); + + result = __iam_path_lookup(path); + if (result < 0) + break; + + while (path->ip_frame->leaf != cursor) { + do_corr(schedule()); + + result = iam_index_lock(path, lh); + do_corr(schedule()); + if (result < 0) + break; + + result = iam_check_full_path(path, 0); + if (result != 0) + break; + + result = iam_index_advance(path); + if (result == 0) { + CERROR("cannot find cursor : %u\n", + cursor); + result = -EIO; + } + if (result < 0) + break; + result = iam_check_full_path(path, 0); + if (result != 0) + break; iam_unlock_array(c, lh); - } - } while (result == -EAGAIN); - if (result < 0) - break; - } + } + } while (result == -EAGAIN); + if (result < 0) + break; + } iam_unlock_array(c, lh); - return result; + return result; } /* @@ -1439,65 +1438,66 @@ int iam_index_next(struct iam_container *c, struct iam_path *path) */ int iam_it_next(struct iam_iterator *it) { - int result; - struct iam_path *path; - struct iam_leaf *leaf; - do_corr(struct iam_ikey *ik_orig); - - /* assert_corr(it->ii_flags&IAM_IT_MOVE); */ - assert_corr(it_state(it) == IAM_IT_ATTACHED || - it_state(it) == IAM_IT_SKEWED); - - path = &it->ii_path; - leaf = &path->ip_leaf; - - assert_corr(iam_leaf_is_locked(leaf)); - - result = 0; - do_corr(ik_orig = it_at_rec(it) ? - iam_it_ikey_get(it, iam_path_ikey(path, 2)) : NULL); - if (it_before(it)) { - assert_corr(!iam_leaf_at_end(leaf)); - it->ii_state = IAM_IT_ATTACHED; - } else { - if (!iam_leaf_at_end(leaf)) - /* advance within leaf node */ - iam_leaf_next(leaf); - /* - * multiple iterations may be necessary due to empty leaves. - */ - while (result == 0 && iam_leaf_at_end(leaf)) { - do_corr(schedule()); - /* advance index portion of the path */ - result = iam_index_next(iam_it_container(it), path); - assert_corr(iam_leaf_is_locked(leaf)); - if (result == 1) { + int result; + struct iam_path *path; + struct iam_leaf *leaf; + + do_corr(struct iam_ikey *ik_orig); + + /* assert_corr(it->ii_flags&IAM_IT_MOVE); */ + assert_corr(it_state(it) == IAM_IT_ATTACHED || + it_state(it) == IAM_IT_SKEWED); + + path = &it->ii_path; + leaf = &path->ip_leaf; + + assert_corr(iam_leaf_is_locked(leaf)); + + result = 0; + do_corr(ik_orig = it_at_rec(it) ? + iam_it_ikey_get(it, iam_path_ikey(path, 2)) : NULL); + if (it_before(it)) { + assert_corr(!iam_leaf_at_end(leaf)); + it->ii_state = IAM_IT_ATTACHED; + } else { + if (!iam_leaf_at_end(leaf)) + /* advance within leaf node */ + iam_leaf_next(leaf); + /* + * multiple iterations may be necessary due to empty leaves. + */ + while (result == 0 && iam_leaf_at_end(leaf)) { + do_corr(schedule()); + /* advance index portion of the path */ + result = iam_index_next(iam_it_container(it), path); + assert_corr(iam_leaf_is_locked(leaf)); + if (result == 1) { struct dynlock_handle *lh; lh = iam_lock_htree(iam_it_container(it), path->ip_frame->leaf, DLT_WRITE); - if (lh != NULL) { - iam_leaf_fini(leaf); - leaf->il_lock = lh; - result = iam_leaf_load(path); - if (result == 0) - iam_leaf_start(leaf); - } else - result = -ENOMEM; - } else if (result == 0) - /* end of container reached */ - result = +1; - if (result != 0) - iam_it_put(it); - } - if (result == 0) - it->ii_state = IAM_IT_ATTACHED; - } - assert_corr(ergo(result == 0, it_state(it) == IAM_IT_ATTACHED)); - assert_corr(ergo(result > 0, it_state(it) == IAM_IT_DETACHED)); - assert_corr(ergo(result == 0 && ik_orig != NULL, - it_ikeycmp(it, ik_orig) >= 0)); - return result; + if (lh != NULL) { + iam_leaf_fini(leaf); + leaf->il_lock = lh; + result = iam_leaf_load(path); + if (result == 0) + iam_leaf_start(leaf); + } else + result = -ENOMEM; + } else if (result == 0) + /* end of container reached */ + result = +1; + if (result != 0) + iam_it_put(it); + } + if (result == 0) + it->ii_state = IAM_IT_ATTACHED; + } + assert_corr(ergo(result == 0, it_state(it) == IAM_IT_ATTACHED)); + assert_corr(ergo(result > 0, it_state(it) == IAM_IT_DETACHED)); + assert_corr(ergo(result == 0 && ik_orig != NULL, + it_ikeycmp(it, ik_orig) >= 0)); + return result; } /* @@ -1508,17 +1508,17 @@ int iam_it_next(struct iam_iterator *it) */ struct iam_rec *iam_it_rec_get(const struct iam_iterator *it) { - assert_corr(it_state(it) == IAM_IT_ATTACHED); - assert_corr(it_at_rec(it)); - return iam_leaf_rec(&it->ii_path.ip_leaf); + assert_corr(it_state(it) == IAM_IT_ATTACHED); + assert_corr(it_at_rec(it)); + return iam_leaf_rec(&it->ii_path.ip_leaf); } static void iam_it_reccpy(struct iam_iterator *it, const struct iam_rec *r) { - struct iam_leaf *folio; + struct iam_leaf *folio; - folio = &it->ii_path.ip_leaf; - iam_leaf_ops(folio)->rec_set(folio, r); + folio = &it->ii_path.ip_leaf; + iam_leaf_ops(folio)->rec_set(folio, r); } /* @@ -1532,22 +1532,22 @@ static void iam_it_reccpy(struct iam_iterator *it, const struct iam_rec *r) int iam_it_rec_set(handle_t *h, struct iam_iterator *it, const struct iam_rec *r) { - int result; - struct iam_path *path; - struct buffer_head *bh; + int result; + struct iam_path *path; + struct buffer_head *bh; - assert_corr(it_state(it) == IAM_IT_ATTACHED && - it->ii_flags&IAM_IT_WRITE); - assert_corr(it_at_rec(it)); + assert_corr(it_state(it) == IAM_IT_ATTACHED && + it->ii_flags&IAM_IT_WRITE); + assert_corr(it_at_rec(it)); - path = &it->ii_path; - bh = path->ip_leaf.il_bh; - result = iam_txn_add(h, path, bh); - if (result == 0) { - iam_it_reccpy(it, r); - result = iam_txn_dirty(h, path, bh); - } - return result; + path = &it->ii_path; + bh = path->ip_leaf.il_bh; + result = iam_txn_add(h, path, bh); + if (result == 0) { + iam_it_reccpy(it, r); + result = iam_txn_dirty(h, path, bh); + } + return result; } /* @@ -1559,10 +1559,10 @@ int iam_it_rec_set(handle_t *h, static struct iam_ikey *iam_it_ikey_get(const struct iam_iterator *it, struct iam_ikey *ikey) { - assert_corr(it_state(it) == IAM_IT_ATTACHED || - it_state(it) == IAM_IT_SKEWED); - assert_corr(it_at_rec(it)); - return iam_leaf_ikey(&it->ii_path.ip_leaf, ikey); + assert_corr(it_state(it) == IAM_IT_ATTACHED || + it_state(it) == IAM_IT_SKEWED); + assert_corr(it_at_rec(it)); + return iam_leaf_ikey(&it->ii_path.ip_leaf, ikey); } /* @@ -1573,10 +1573,10 @@ static struct iam_ikey *iam_it_ikey_get(const struct iam_iterator *it, */ struct iam_key *iam_it_key_get(const struct iam_iterator *it) { - assert_corr(it_state(it) == IAM_IT_ATTACHED || - it_state(it) == IAM_IT_SKEWED); - assert_corr(it_at_rec(it)); - return iam_leaf_key(&it->ii_path.ip_leaf); + assert_corr(it_state(it) == IAM_IT_ATTACHED || + it_state(it) == IAM_IT_SKEWED); + assert_corr(it_at_rec(it)); + return iam_leaf_key(&it->ii_path.ip_leaf); } /* @@ -1587,10 +1587,10 @@ struct iam_key *iam_it_key_get(const struct iam_iterator *it) */ int iam_it_key_size(const struct iam_iterator *it) { - assert_corr(it_state(it) == IAM_IT_ATTACHED || - it_state(it) == IAM_IT_SKEWED); - assert_corr(it_at_rec(it)); - return iam_leaf_key_size(&it->ii_path.ip_leaf); + assert_corr(it_state(it) == IAM_IT_ATTACHED || + it_state(it) == IAM_IT_SKEWED); + assert_corr(it_at_rec(it)); + return iam_leaf_key_size(&it->ii_path.ip_leaf); } static struct buffer_head * @@ -1728,55 +1728,55 @@ fail: static int iam_new_leaf(handle_t *handle, struct iam_leaf *leaf) { - int err; - iam_ptr_t blknr; - struct buffer_head *new_leaf; - struct buffer_head *old_leaf; - struct iam_container *c; - struct inode *obj; - struct iam_path *path; + int err; + iam_ptr_t blknr; + struct buffer_head *new_leaf; + struct buffer_head *old_leaf; + struct iam_container *c; + struct inode *obj; + struct iam_path *path; - c = iam_leaf_container(leaf); - path = leaf->il_path; + c = iam_leaf_container(leaf); + path = leaf->il_path; - obj = c->ic_object; + obj = c->ic_object; new_leaf = iam_new_node(handle, c, &blknr, &err); - do_corr(schedule()); - if (new_leaf != NULL) { - struct dynlock_handle *lh; + do_corr(schedule()); + if (new_leaf != NULL) { + struct dynlock_handle *lh; lh = iam_lock_htree(c, blknr, DLT_WRITE); - do_corr(schedule()); - if (lh != NULL) { - iam_leaf_ops(leaf)->init_new(c, new_leaf); - do_corr(schedule()); - old_leaf = leaf->il_bh; - iam_leaf_split(leaf, &new_leaf, blknr); - if (old_leaf != leaf->il_bh) { - /* - * Switched to the new leaf. - */ - iam_leaf_unlock(leaf); - leaf->il_lock = lh; - path->ip_frame->leaf = blknr; - } else + do_corr(schedule()); + if (lh != NULL) { + iam_leaf_ops(leaf)->init_new(c, new_leaf); + do_corr(schedule()); + old_leaf = leaf->il_bh; + iam_leaf_split(leaf, &new_leaf, blknr); + if (old_leaf != leaf->il_bh) { + /* + * Switched to the new leaf. + */ + iam_leaf_unlock(leaf); + leaf->il_lock = lh; + path->ip_frame->leaf = blknr; + } else iam_unlock_htree(path->ip_container, lh); - do_corr(schedule()); - err = iam_txn_dirty(handle, path, new_leaf); - if (err == 0) - err = ldiskfs_mark_inode_dirty(handle, obj); - do_corr(schedule()); - } else - err = -ENOMEM; + do_corr(schedule()); + err = iam_txn_dirty(handle, path, new_leaf); + if (err == 0) + err = ldiskfs_mark_inode_dirty(handle, obj); + do_corr(schedule()); + } else + err = -ENOMEM; brelse(new_leaf); - } - assert_inv(iam_path_check(iam_leaf_path(leaf))); - return err; + } + assert_inv(iam_path_check(iam_leaf_path(leaf))); + return err; } static inline void dx_set_limit(struct iam_entry *entries, unsigned value) { - ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value); + ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value); } static int iam_shift_entries(struct iam_path *path, @@ -1784,120 +1784,119 @@ static int iam_shift_entries(struct iam_path *path, struct iam_entry *entries, struct iam_entry *entries2, u32 newblock) { - unsigned count1; - unsigned count2; - int delta; + unsigned count1; + unsigned count2; + int delta; - struct iam_frame *parent = frame - 1; - struct iam_ikey *pivot = iam_path_ikey(path, 3); + struct iam_frame *parent = frame - 1; + struct iam_ikey *pivot = iam_path_ikey(path, 3); - delta = dx_index_is_compat(path) ? 0 : +1; + delta = dx_index_is_compat(path) ? 0 : +1; - count1 = count/2 + delta; - count2 = count - count1; - dx_get_ikey(path, iam_entry_shift(path, entries, count1), pivot); + count1 = count/2 + delta; + count2 = count - count1; + dx_get_ikey(path, iam_entry_shift(path, entries, count1), pivot); - dxtrace(printk("Split index %d/%d\n", count1, count2)); + dxtrace(printk("Split index %d/%d\n", count1, count2)); - memcpy((char *) iam_entry_shift(path, entries2, delta), - (char *) iam_entry_shift(path, entries, count1), - count2 * iam_entry_size(path)); + memcpy((char *) iam_entry_shift(path, entries2, delta), + (char *) iam_entry_shift(path, entries, count1), + count2 * iam_entry_size(path)); - dx_set_count(entries2, count2 + delta); - dx_set_limit(entries2, dx_node_limit(path)); + dx_set_count(entries2, count2 + delta); + dx_set_limit(entries2, dx_node_limit(path)); - /* - * NOTE: very subtle piece of code competing dx_probe() may find 2nd - * level index in root index, then we insert new index here and set - * new count in that 2nd level index. so, dx_probe() may see 2nd level - * index w/o hash it looks for. the solution is to check root index - * after we locked just founded 2nd level index -bzzz - */ - iam_insert_key_lock(path, parent, pivot, newblock); + /* + * NOTE: very subtle piece of code competing dx_probe() may find 2nd + * level index in root index, then we insert new index here and set + * new count in that 2nd level index. so, dx_probe() may see 2nd level + * index w/o hash it looks for. the solution is to check root index + * after we locked just founded 2nd level index -bzzz + */ + iam_insert_key_lock(path, parent, pivot, newblock); - /* - * now old and new 2nd level index blocks contain all pointers, so - * dx_probe() may find it in the both. it's OK -bzzz - */ - iam_lock_bh(frame->bh); - dx_set_count(entries, count1); - iam_unlock_bh(frame->bh); + /* + * now old and new 2nd level index blocks contain all pointers, so + * dx_probe() may find it in the both. it's OK -bzzz + */ + iam_lock_bh(frame->bh); + dx_set_count(entries, count1); + iam_unlock_bh(frame->bh); - /* - * now old 2nd level index block points to first half of leafs. it's - * importand that dx_probe() must check root index block for changes - * under dx_lock_bh(frame->bh) -bzzz - */ + /* + * now old 2nd level index block points to first half of leafs. it's + * importand that dx_probe() must check root index block for changes + * under dx_lock_bh(frame->bh) -bzzz + */ - return count1; + return count1; } int split_index_node(handle_t *handle, struct iam_path *path, struct dynlock_handle **lh) { - - struct iam_entry *entries; /* old block contents */ - struct iam_entry *entries2; /* new block contents */ + struct iam_entry *entries; /* old block contents */ + struct iam_entry *entries2; /* new block contents */ struct iam_frame *frame, *safe; struct buffer_head *bh_new[DX_MAX_TREE_HEIGHT] = {NULL}; - u32 newblock[DX_MAX_TREE_HEIGHT] = {0}; - struct dynlock_handle *lock[DX_MAX_TREE_HEIGHT] = {NULL,}; - struct dynlock_handle *new_lock[DX_MAX_TREE_HEIGHT] = {NULL,}; - struct inode *dir = iam_path_obj(path); - struct iam_descr *descr; - int nr_splet; - int i, err; - - descr = iam_path_descr(path); - /* - * Algorithm below depends on this. - */ - assert_corr(dx_root_limit(path) < dx_node_limit(path)); - - frame = path->ip_frame; - entries = frame->entries; - - /* - * Tall-tree handling: we might have to split multiple index blocks - * all the way up to tree root. Tricky point here is error handling: - * to avoid complicated undo/rollback we - * - * - first allocate all necessary blocks - * - * - insert pointers into them atomically. - */ - - /* - * Locking: leaf is already locked. htree-locks are acquired on all - * index nodes that require split bottom-to-top, on the "safe" node, - * and on all new nodes - */ - - dxtrace(printk("using %u of %u node entries\n", - dx_get_count(entries), dx_get_limit(entries))); - - /* What levels need split? */ - for (nr_splet = 0; frame >= path->ip_frames && - dx_get_count(frame->entries) == dx_get_limit(frame->entries); - --frame, ++nr_splet) { - do_corr(schedule()); - if (nr_splet == DX_MAX_TREE_HEIGHT) { - /* - CWARN(dir->i_sb, __FUNCTION__, - "Directory index full!\n"); - */ - err = -ENOSPC; - goto cleanup; - } - } - - safe = frame; - - /* - * Lock all nodes, bottom to top. - */ - for (frame = path->ip_frame, i = nr_splet; i >= 0; --i, --frame) { + u32 newblock[DX_MAX_TREE_HEIGHT] = {0}; + struct dynlock_handle *lock[DX_MAX_TREE_HEIGHT] = {NULL,}; + struct dynlock_handle *new_lock[DX_MAX_TREE_HEIGHT] = {NULL,}; + struct inode *dir = iam_path_obj(path); + struct iam_descr *descr; + int nr_splet; + int i, err; + + descr = iam_path_descr(path); + /* + * Algorithm below depends on this. + */ + assert_corr(dx_root_limit(path) < dx_node_limit(path)); + + frame = path->ip_frame; + entries = frame->entries; + + /* + * Tall-tree handling: we might have to split multiple index blocks + * all the way up to tree root. Tricky point here is error handling: + * to avoid complicated undo/rollback we + * + * - first allocate all necessary blocks + * + * - insert pointers into them atomically. + */ + + /* + * Locking: leaf is already locked. htree-locks are acquired on all + * index nodes that require split bottom-to-top, on the "safe" node, + * and on all new nodes + */ + + dxtrace(printk("using %u of %u node entries\n", + dx_get_count(entries), dx_get_limit(entries))); + + /* What levels need split? */ + for (nr_splet = 0; frame >= path->ip_frames && + dx_get_count(frame->entries) == dx_get_limit(frame->entries); + --frame, ++nr_splet) { + do_corr(schedule()); + if (nr_splet == DX_MAX_TREE_HEIGHT) { + /* + * CWARN(dir->i_sb, __FUNCTION__, + * "Directory index full!\n"); + */ + err = -ENOSPC; + goto cleanup; + } + } + + safe = frame; + + /* + * Lock all nodes, bottom to top. + */ + for (frame = path->ip_frame, i = nr_splet; i >= 0; --i, --frame) { do_corr(schedule()); lock[i] = iam_lock_htree(path->ip_container, frame->curidx, DLT_WRITE); @@ -1905,248 +1904,251 @@ int split_index_node(handle_t *handle, struct iam_path *path, err = -ENOMEM; goto cleanup; } - } - - /* - * Check for concurrent index modification. - */ - err = iam_check_full_path(path, 1); - if (err) - goto cleanup; - /* - * And check that the same number of nodes is to be split. - */ - for (i = 0, frame = path->ip_frame; frame >= path->ip_frames && - dx_get_count(frame->entries) == dx_get_limit(frame->entries); - --frame, ++i) { - ; - } - if (i != nr_splet) { - err = -EAGAIN; - goto cleanup; - } - - /* Go back down, allocating blocks, locking them, and adding into - * transaction... */ - for (frame = safe + 1, i = 0; i < nr_splet; ++i, ++frame) { + } + + /* + * Check for concurrent index modification. + */ + err = iam_check_full_path(path, 1); + if (err) + goto cleanup; + /* + * And check that the same number of nodes is to be split. + */ + for (i = 0, frame = path->ip_frame; frame >= path->ip_frames && + dx_get_count(frame->entries) == dx_get_limit(frame->entries); + --frame, ++i) { + ; + } + if (i != nr_splet) { + err = -EAGAIN; + goto cleanup; + } + + /* + * Go back down, allocating blocks, locking them, and adding into + * transaction... + */ + for (frame = safe + 1, i = 0; i < nr_splet; ++i, ++frame) { bh_new[i] = iam_new_node(handle, path->ip_container, &newblock[i], &err); - do_corr(schedule()); - if (!bh_new[i] || - descr->id_ops->id_node_init(path->ip_container, - bh_new[i], 0) != 0) - goto cleanup; + do_corr(schedule()); + if (!bh_new[i] || + descr->id_ops->id_node_init(path->ip_container, + bh_new[i], 0) != 0) + goto cleanup; + new_lock[i] = iam_lock_htree(path->ip_container, newblock[i], DLT_WRITE); if (new_lock[i] == NULL) { err = -ENOMEM; goto cleanup; } - do_corr(schedule()); - BUFFER_TRACE(frame->bh, "get_write_access"); - err = ldiskfs_journal_get_write_access(handle, frame->bh); - if (err) - goto journal_error; - } - /* Add "safe" node to transaction too */ - if (safe + 1 != path->ip_frames) { - do_corr(schedule()); - err = ldiskfs_journal_get_write_access(handle, safe->bh); - if (err) - goto journal_error; - } - - /* Go through nodes once more, inserting pointers */ - for (frame = safe + 1, i = 0; i < nr_splet; ++i, ++frame) { - unsigned count; - int idx; - struct buffer_head *bh2; - struct buffer_head *bh; - - entries = frame->entries; - count = dx_get_count(entries); - idx = iam_entry_diff(path, frame->at, entries); - - bh2 = bh_new[i]; - entries2 = dx_get_entries(path, bh2->b_data, 0); - - bh = frame->bh; - if (frame == path->ip_frames) { - /* splitting root node. Tricky point: - * - * In the "normal" B-tree we'd split root *and* add - * new root to the tree with pointers to the old root - * and its sibling (thus introducing two new nodes). - * - * In htree it's enough to add one node, because - * capacity of the root node is smaller than that of - * non-root one. - */ - struct iam_frame *frames; - struct iam_entry *next; - - assert_corr(i == 0); - - do_corr(schedule()); - - frames = path->ip_frames; - memcpy((char *) entries2, (char *) entries, - count * iam_entry_size(path)); - dx_set_limit(entries2, dx_node_limit(path)); - - /* Set up root */ - iam_lock_bh(frame->bh); - next = descr->id_ops->id_root_inc(path->ip_container, - path, frame); - dx_set_block(path, next, newblock[0]); - iam_unlock_bh(frame->bh); - - do_corr(schedule()); - /* Shift frames in the path */ - memmove(frames + 2, frames + 1, - (sizeof path->ip_frames) - 2 * sizeof frames[0]); - /* Add new access path frame */ - frames[1].at = iam_entry_shift(path, entries2, idx); - frames[1].entries = entries = entries2; - frames[1].bh = bh2; - assert_inv(dx_node_check(path, frame)); - ++ path->ip_frame; - ++ frame; - assert_inv(dx_node_check(path, frame)); - bh_new[0] = NULL; /* buffer head is "consumed" */ + do_corr(schedule()); + BUFFER_TRACE(frame->bh, "get_write_access"); + err = ldiskfs_journal_get_write_access(handle, frame->bh); + if (err) + goto journal_error; + } + /* Add "safe" node to transaction too */ + if (safe + 1 != path->ip_frames) { + do_corr(schedule()); + err = ldiskfs_journal_get_write_access(handle, safe->bh); + if (err) + goto journal_error; + } + + /* Go through nodes once more, inserting pointers */ + for (frame = safe + 1, i = 0; i < nr_splet; ++i, ++frame) { + unsigned count; + int idx; + struct buffer_head *bh2; + struct buffer_head *bh; + + entries = frame->entries; + count = dx_get_count(entries); + idx = iam_entry_diff(path, frame->at, entries); + + bh2 = bh_new[i]; + entries2 = dx_get_entries(path, bh2->b_data, 0); + + bh = frame->bh; + if (frame == path->ip_frames) { + /* splitting root node. Tricky point: + * + * In the "normal" B-tree we'd split root *and* add + * new root to the tree with pointers to the old root + * and its sibling (thus introducing two new nodes). + * + * In htree it's enough to add one node, because + * capacity of the root node is smaller than that of + * non-root one. + */ + struct iam_frame *frames; + struct iam_entry *next; + + assert_corr(i == 0); + + do_corr(schedule()); + + frames = path->ip_frames; + memcpy((char *) entries2, (char *) entries, + count * iam_entry_size(path)); + dx_set_limit(entries2, dx_node_limit(path)); + + /* Set up root */ + iam_lock_bh(frame->bh); + next = descr->id_ops->id_root_inc(path->ip_container, + path, frame); + dx_set_block(path, next, newblock[0]); + iam_unlock_bh(frame->bh); + + do_corr(schedule()); + /* Shift frames in the path */ + memmove(frames + 2, frames + 1, + (sizeof path->ip_frames) - 2 * sizeof frames[0]); + /* Add new access path frame */ + frames[1].at = iam_entry_shift(path, entries2, idx); + frames[1].entries = entries = entries2; + frames[1].bh = bh2; + assert_inv(dx_node_check(path, frame)); + ++ path->ip_frame; + ++ frame; + assert_inv(dx_node_check(path, frame)); + bh_new[0] = NULL; /* buffer head is "consumed" */ err = ldiskfs_handle_dirty_metadata(handle, NULL, bh2); - if (err) - goto journal_error; - do_corr(schedule()); - } else { - /* splitting non-root index node. */ - struct iam_frame *parent = frame - 1; - - do_corr(schedule()); - count = iam_shift_entries(path, frame, count, - entries, entries2, newblock[i]); - /* Which index block gets the new entry? */ - if (idx >= count) { - int d = dx_index_is_compat(path) ? 0 : +1; - - frame->at = iam_entry_shift(path, entries2, - idx - count + d); - frame->entries = entries = entries2; - frame->curidx = newblock[i]; - swap(frame->bh, bh2); - assert_corr(lock[i + 1] != NULL); - assert_corr(new_lock[i] != NULL); - swap(lock[i + 1], new_lock[i]); - bh_new[i] = bh2; - parent->at = iam_entry_shift(path, - parent->at, +1); - } - assert_inv(dx_node_check(path, frame)); - assert_inv(dx_node_check(path, parent)); - dxtrace(dx_show_index ("node", frame->entries)); - dxtrace(dx_show_index ("node", - ((struct dx_node *) bh2->b_data)->entries)); + if (err) + goto journal_error; + do_corr(schedule()); + } else { + /* splitting non-root index node. */ + struct iam_frame *parent = frame - 1; + + do_corr(schedule()); + count = iam_shift_entries(path, frame, count, + entries, entries2, newblock[i]); + /* Which index block gets the new entry? */ + if (idx >= count) { + int d = dx_index_is_compat(path) ? 0 : +1; + + frame->at = iam_entry_shift(path, entries2, + idx - count + d); + frame->entries = entries = entries2; + frame->curidx = newblock[i]; + swap(frame->bh, bh2); + assert_corr(lock[i + 1] != NULL); + assert_corr(new_lock[i] != NULL); + swap(lock[i + 1], new_lock[i]); + bh_new[i] = bh2; + parent->at = iam_entry_shift(path, + parent->at, +1); + } + assert_inv(dx_node_check(path, frame)); + assert_inv(dx_node_check(path, parent)); + dxtrace(dx_show_index("node", frame->entries)); + dxtrace(dx_show_index("node", + ((struct dx_node *) bh2->b_data)->entries)); err = ldiskfs_handle_dirty_metadata(handle, NULL, bh2); - if (err) - goto journal_error; - do_corr(schedule()); + if (err) + goto journal_error; + do_corr(schedule()); err = ldiskfs_handle_dirty_metadata(handle, NULL, parent->bh); - if (err) - goto journal_error; - } - do_corr(schedule()); + if (err) + goto journal_error; + } + do_corr(schedule()); err = ldiskfs_handle_dirty_metadata(handle, NULL, bh); - if (err) - goto journal_error; - } - /* - * This function was called to make insertion of new leaf - * possible. Check that it fulfilled its obligations. - */ - assert_corr(dx_get_count(path->ip_frame->entries) < - dx_get_limit(path->ip_frame->entries)); - assert_corr(lock[nr_splet] != NULL); - *lh = lock[nr_splet]; - lock[nr_splet] = NULL; - if (nr_splet > 0) { - /* - * Log ->i_size modification. - */ - err = ldiskfs_mark_inode_dirty(handle, dir); - if (err) - goto journal_error; - } - goto cleanup; + if (err) + goto journal_error; + } + /* + * This function was called to make insertion of new leaf + * possible. Check that it fulfilled its obligations. + */ + assert_corr(dx_get_count(path->ip_frame->entries) < + dx_get_limit(path->ip_frame->entries)); + assert_corr(lock[nr_splet] != NULL); + *lh = lock[nr_splet]; + lock[nr_splet] = NULL; + if (nr_splet > 0) { + /* + * Log ->i_size modification. + */ + err = ldiskfs_mark_inode_dirty(handle, dir); + if (err) + goto journal_error; + } + goto cleanup; journal_error: - ldiskfs_std_error(dir->i_sb, err); + ldiskfs_std_error(dir->i_sb, err); cleanup: iam_unlock_array(path->ip_container, lock); iam_unlock_array(path->ip_container, new_lock); - assert_corr(err || iam_frame_is_locked(path, path->ip_frame)); + assert_corr(err || iam_frame_is_locked(path, path->ip_frame)); - do_corr(schedule()); - for (i = 0; i < ARRAY_SIZE(bh_new); ++i) { - if (bh_new[i] != NULL) - brelse(bh_new[i]); - } - return err; + do_corr(schedule()); + for (i = 0; i < ARRAY_SIZE(bh_new); ++i) { + if (bh_new[i] != NULL) + brelse(bh_new[i]); + } + return err; } static int iam_add_rec(handle_t *handle, struct iam_iterator *it, struct iam_path *path, const struct iam_key *k, const struct iam_rec *r) { - int err; - struct iam_leaf *leaf; - - leaf = &path->ip_leaf; - assert_inv(iam_path_check(path)); - err = iam_txn_add(handle, path, leaf->il_bh); - if (err == 0) { - do_corr(schedule()); - if (!iam_leaf_can_add(leaf, k, r)) { - struct dynlock_handle *lh = NULL; - - do { - assert_corr(lh == NULL); - do_corr(schedule()); - err = split_index_node(handle, path, &lh); - if (err == -EAGAIN) { - assert_corr(lh == NULL); - - iam_path_fini(path); - it->ii_state = IAM_IT_DETACHED; - - do_corr(schedule()); - err = iam_it_get_exact(it, k); - if (err == -ENOENT) - err = +1; /* repeat split */ - else if (err == 0) - err = -EEXIST; - } - } while (err > 0); - assert_inv(iam_path_check(path)); - if (err == 0) { - assert_corr(lh != NULL); - do_corr(schedule()); - err = iam_new_leaf(handle, leaf); - if (err == 0) - err = iam_txn_dirty(handle, path, - path->ip_frame->bh); - } + int err; + struct iam_leaf *leaf; + + leaf = &path->ip_leaf; + assert_inv(iam_path_check(path)); + err = iam_txn_add(handle, path, leaf->il_bh); + if (err == 0) { + do_corr(schedule()); + if (!iam_leaf_can_add(leaf, k, r)) { + struct dynlock_handle *lh = NULL; + + do { + assert_corr(lh == NULL); + do_corr(schedule()); + err = split_index_node(handle, path, &lh); + if (err == -EAGAIN) { + assert_corr(lh == NULL); + + iam_path_fini(path); + it->ii_state = IAM_IT_DETACHED; + + do_corr(schedule()); + err = iam_it_get_exact(it, k); + if (err == -ENOENT) + err = +1; /* repeat split */ + else if (err == 0) + err = -EEXIST; + } + } while (err > 0); + assert_inv(iam_path_check(path)); + if (err == 0) { + assert_corr(lh != NULL); + do_corr(schedule()); + err = iam_new_leaf(handle, leaf); + if (err == 0) + err = iam_txn_dirty(handle, path, + path->ip_frame->bh); + } iam_unlock_htree(path->ip_container, lh); - do_corr(schedule()); - } - if (err == 0) { - iam_leaf_rec_add(leaf, k, r); - err = iam_txn_dirty(handle, path, leaf->il_bh); - } - } - assert_inv(iam_path_check(path)); - return err; + do_corr(schedule()); + } + if (err == 0) { + iam_leaf_rec_add(leaf, k, r); + err = iam_txn_dirty(handle, path, leaf->il_bh); + } + } + assert_inv(iam_path_check(path)); + return err; } /* @@ -2167,24 +2169,24 @@ static int iam_add_rec(handle_t *handle, struct iam_iterator *it, int iam_it_rec_insert(handle_t *h, struct iam_iterator *it, const struct iam_key *k, const struct iam_rec *r) { - int result; - struct iam_path *path; + int result; + struct iam_path *path; - path = &it->ii_path; + path = &it->ii_path; - assert_corr(it->ii_flags&IAM_IT_WRITE); - assert_corr(it_state(it) == IAM_IT_ATTACHED || - it_state(it) == IAM_IT_SKEWED); - assert_corr(ergo(it_state(it) == IAM_IT_ATTACHED, - it_keycmp(it, k) <= 0)); - assert_corr(ergo(it_before(it), it_keycmp(it, k) > 0)); - result = iam_add_rec(h, it, path, k, r); - if (result == 0) - it->ii_state = IAM_IT_ATTACHED; - assert_corr(ergo(result == 0, - it_state(it) == IAM_IT_ATTACHED && - it_keycmp(it, k) == 0)); - return result; + assert_corr(it->ii_flags&IAM_IT_WRITE); + assert_corr(it_state(it) == IAM_IT_ATTACHED || + it_state(it) == IAM_IT_SKEWED); + assert_corr(ergo(it_state(it) == IAM_IT_ATTACHED, + it_keycmp(it, k) <= 0)); + assert_corr(ergo(it_before(it), it_keycmp(it, k) > 0)); + result = iam_add_rec(h, it, path, k, r); + if (result == 0) + it->ii_state = IAM_IT_ATTACHED; + assert_corr(ergo(result == 0, + it_state(it) == IAM_IT_ATTACHED && + it_keycmp(it, k) == 0)); + return result; } static inline int iam_idle_blocks_limit(struct inode *inode) @@ -2219,8 +2221,8 @@ static iam_ptr_t iam_index_shrink(handle_t *h, struct iam_path *p, 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; } @@ -2233,8 +2235,10 @@ static iam_ptr_t iam_index_shrink(handle_t *h, struct iam_path *p, iam_lock_bh(frame->bh); entries = frame->entries; count = dx_get_count(entries); - /* NOT shrink the last entry in the index node, which can be reused - * directly by next new node. */ + /* + * NOT shrink the last entry in the index node, which can be reused + * directly by next new node. + */ if (count == 2) { iam_unlock_bh(frame->bh); iam_unlock_htree(c, lh); @@ -2242,11 +2246,13 @@ static iam_ptr_t iam_index_shrink(handle_t *h, struct iam_path *p, } pos = iam_find_position(p, frame); - /* There may be some new leaf nodes have been added or empty leaf nodes + /* + * There may be some new leaf nodes have been added or empty leaf nodes * have been shrinked during my delete operation. * * If the empty leaf is not under current index node because the index - * node has been split, then just skip the empty leaf, which is rare. */ + * node has been split, then just skip the empty leaf, which is rare. + */ if (unlikely(frame->leaf != dx_get_block(p, pos))) { iam_unlock_bh(frame->bh); iam_unlock_htree(c, lh); @@ -2361,8 +2367,8 @@ static void iam_recycle_leaf(handle_t *h, struct iam_path *p, 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); } /* @@ -2376,26 +2382,26 @@ unlock: */ int iam_it_rec_delete(handle_t *h, struct iam_iterator *it) { - int result; - struct iam_leaf *leaf; - struct iam_path *path; + int result; + struct iam_leaf *leaf; + struct iam_path *path; - assert_corr(it_state(it) == IAM_IT_ATTACHED && - it->ii_flags&IAM_IT_WRITE); - assert_corr(it_at_rec(it)); + assert_corr(it_state(it) == IAM_IT_ATTACHED && + it->ii_flags&IAM_IT_WRITE); + assert_corr(it_at_rec(it)); - path = &it->ii_path; - leaf = &path->ip_leaf; + path = &it->ii_path; + leaf = &path->ip_leaf; - assert_inv(iam_path_check(path)); + assert_inv(iam_path_check(path)); - result = iam_txn_add(h, path, leaf->il_bh); - /* - * no compaction for now. - */ - if (result == 0) { - iam_rec_del(leaf, it->ii_flags&IAM_IT_MOVE); - result = iam_txn_dirty(h, path, leaf->il_bh); + result = iam_txn_add(h, path, leaf->il_bh); + /* + * no compaction for now. + */ + if (result == 0) { + iam_rec_del(leaf, it->ii_flags&IAM_IT_MOVE); + result = iam_txn_dirty(h, path, leaf->il_bh); if (result == 0 && iam_leaf_at_end(leaf)) { struct buffer_head *bh = NULL; iam_ptr_t blk; @@ -2412,11 +2418,11 @@ int iam_it_rec_delete(handle_t *h, struct iam_iterator *it) brelse(bh); } } - } - assert_inv(iam_path_check(path)); - assert_corr(it_state(it) == IAM_IT_ATTACHED || - it_state(it) == IAM_IT_DETACHED); - return result; + } + assert_inv(iam_path_check(path)); + assert_corr(it_state(it) == IAM_IT_ATTACHED || + it_state(it) == IAM_IT_DETACHED); + return result; } /* @@ -2428,15 +2434,15 @@ int iam_it_rec_delete(handle_t *h, struct iam_iterator *it) */ iam_pos_t iam_it_store(const struct iam_iterator *it) { - iam_pos_t result; + iam_pos_t result; - assert_corr(it_state(it) == IAM_IT_ATTACHED); - assert_corr(it_at_rec(it)); - assert_corr(iam_it_container(it)->ic_descr->id_ikey_size <= - sizeof result); + assert_corr(it_state(it) == IAM_IT_ATTACHED); + assert_corr(it_at_rec(it)); + assert_corr(iam_it_container(it)->ic_descr->id_ikey_size <= + sizeof result); - result = 0; - return *(iam_pos_t *)iam_it_ikey_get(it, (void *)&result); + result = 0; + return *(iam_pos_t *)iam_it_ikey_get(it, (void *)&result); } /* @@ -2449,10 +2455,10 @@ iam_pos_t iam_it_store(const struct iam_iterator *it) */ int iam_it_load(struct iam_iterator *it, iam_pos_t pos) { - assert_corr(it_state(it) == IAM_IT_DETACHED && - it->ii_flags&IAM_IT_MOVE); - assert_corr(iam_it_container(it)->ic_descr->id_ikey_size <= sizeof pos); - return iam_it_iget(it, (struct iam_ikey *)&pos); + assert_corr(it_state(it) == IAM_IT_DETACHED && + it->ii_flags&IAM_IT_MOVE); + assert_corr(iam_it_container(it)->ic_descr->id_ikey_size <= sizeof pos); + return iam_it_iget(it, (struct iam_ikey *)&pos); } /***********************************************************************/ @@ -2461,58 +2467,58 @@ int iam_it_load(struct iam_iterator *it, iam_pos_t pos) static inline int ptr_inside(void *base, size_t size, void *ptr) { - return (base <= ptr) && (ptr < base + size); + return (base <= ptr) && (ptr < base + size); } static int iam_frame_invariant(struct iam_frame *f) { - return - (f->bh != NULL && - f->bh->b_data != NULL && - ptr_inside(f->bh->b_data, f->bh->b_size, f->entries) && - ptr_inside(f->bh->b_data, f->bh->b_size, f->at) && - f->entries <= f->at); + return + (f->bh != NULL && + f->bh->b_data != NULL && + ptr_inside(f->bh->b_data, f->bh->b_size, f->entries) && + ptr_inside(f->bh->b_data, f->bh->b_size, f->at) && + f->entries <= f->at); } static int iam_leaf_invariant(struct iam_leaf *l) { - return - l->il_bh != NULL && - l->il_bh->b_data != NULL && - ptr_inside(l->il_bh->b_data, l->il_bh->b_size, l->il_entries) && - ptr_inside(l->il_bh->b_data, l->il_bh->b_size, l->il_at) && - l->il_entries <= l->il_at; + return + l->il_bh != NULL && + l->il_bh->b_data != NULL && + ptr_inside(l->il_bh->b_data, l->il_bh->b_size, l->il_entries) && + ptr_inside(l->il_bh->b_data, l->il_bh->b_size, l->il_at) && + l->il_entries <= l->il_at; } static int iam_path_invariant(struct iam_path *p) { - int i; + int i; - if (p->ip_container == NULL || - p->ip_indirect < 0 || p->ip_indirect > DX_MAX_TREE_HEIGHT - 1 || - p->ip_frame != p->ip_frames + p->ip_indirect || - !iam_leaf_invariant(&p->ip_leaf)) - return 0; - for (i = 0; i < ARRAY_SIZE(p->ip_frames); ++i) { - if (i <= p->ip_indirect) { - if (!iam_frame_invariant(&p->ip_frames[i])) - return 0; - } - } - return 1; + if (p->ip_container == NULL || + p->ip_indirect < 0 || p->ip_indirect > DX_MAX_TREE_HEIGHT - 1 || + p->ip_frame != p->ip_frames + p->ip_indirect || + !iam_leaf_invariant(&p->ip_leaf)) + return 0; + for (i = 0; i < ARRAY_SIZE(p->ip_frames); ++i) { + if (i <= p->ip_indirect) { + if (!iam_frame_invariant(&p->ip_frames[i])) + return 0; + } + } + return 1; } int iam_it_invariant(struct iam_iterator *it) { - return - (it->ii_state == IAM_IT_DETACHED || - it->ii_state == IAM_IT_ATTACHED || - it->ii_state == IAM_IT_SKEWED) && - !(it->ii_flags & ~(IAM_IT_MOVE | IAM_IT_WRITE)) && - ergo(it->ii_state == IAM_IT_ATTACHED || - it->ii_state == IAM_IT_SKEWED, - iam_path_invariant(&it->ii_path) && - equi(it_at_rec(it), it->ii_state == IAM_IT_SKEWED)); + return + (it->ii_state == IAM_IT_DETACHED || + it->ii_state == IAM_IT_ATTACHED || + it->ii_state == IAM_IT_SKEWED) && + !(it->ii_flags & ~(IAM_IT_MOVE | IAM_IT_WRITE)) && + ergo(it->ii_state == IAM_IT_ATTACHED || + it->ii_state == IAM_IT_SKEWED, + iam_path_invariant(&it->ii_path) && + equi(it_at_rec(it), it->ii_state == IAM_IT_SKEWED)); } /* @@ -2524,20 +2530,20 @@ int iam_it_invariant(struct iam_iterator *it) int iam_lookup(struct iam_container *c, const struct iam_key *k, struct iam_rec *r, struct iam_path_descr *pd) { - struct iam_iterator it; - int result; + struct iam_iterator it; + int result; - iam_it_init(&it, c, 0, pd); + iam_it_init(&it, c, 0, pd); - result = iam_it_get_exact(&it, k); - if (result == 0) - /* - * record with required key found, copy it into user buffer - */ - iam_reccpy(&it.ii_path.ip_leaf, r); - iam_it_put(&it); - iam_it_fini(&it); - return result; + result = iam_it_get_exact(&it, k); + if (result == 0) + /* + * record with required key found, copy it into user buffer + */ + iam_reccpy(&it.ii_path.ip_leaf, r); + iam_it_put(&it); + iam_it_fini(&it); + return result; } /* @@ -2553,19 +2559,19 @@ int iam_lookup(struct iam_container *c, const struct iam_key *k, int iam_insert(handle_t *h, struct iam_container *c, const struct iam_key *k, const struct iam_rec *r, struct iam_path_descr *pd) { - struct iam_iterator it; - int result; + struct iam_iterator it; + int result; - iam_it_init(&it, c, IAM_IT_WRITE, pd); + iam_it_init(&it, c, IAM_IT_WRITE, pd); - result = iam_it_get_exact(&it, k); - if (result == -ENOENT) - result = iam_it_rec_insert(h, &it, k, r); - else if (result == 0) - result = -EEXIST; - iam_it_put(&it); - iam_it_fini(&it); - return result; + result = iam_it_get_exact(&it, k); + if (result == -ENOENT) + result = iam_it_rec_insert(h, &it, k, r); + else if (result == 0) + result = -EEXIST; + iam_it_put(&it); + iam_it_fini(&it); + return result; } /* @@ -2578,7 +2584,7 @@ int iam_insert(handle_t *h, struct iam_container *c, const struct iam_key *k, int iam_update(handle_t *h, struct iam_container *c, const struct iam_key *k, const struct iam_rec *r, struct iam_path_descr *pd) { - struct iam_iterator it; + struct iam_iterator it; struct iam_leaf *folio; int result; @@ -2593,9 +2599,9 @@ int iam_update(handle_t *h, struct iam_container *c, const struct iam_key *k, else result = 1; } - iam_it_put(&it); - iam_it_fini(&it); - return result; + iam_it_put(&it); + iam_it_fini(&it); + return result; } /* @@ -2609,27 +2615,27 @@ int iam_update(handle_t *h, struct iam_container *c, const struct iam_key *k, int iam_delete(handle_t *h, struct iam_container *c, const struct iam_key *k, struct iam_path_descr *pd) { - struct iam_iterator it; - int result; + struct iam_iterator it; + int result; - iam_it_init(&it, c, IAM_IT_WRITE, pd); + iam_it_init(&it, c, IAM_IT_WRITE, pd); - result = iam_it_get_exact(&it, k); - if (result == 0) - iam_it_rec_delete(h, &it); - iam_it_put(&it); - iam_it_fini(&it); - return result; + result = iam_it_get_exact(&it, k); + if (result == 0) + iam_it_rec_delete(h, &it); + iam_it_put(&it); + iam_it_fini(&it); + return result; } int iam_root_limit(int rootgap, int blocksize, int size) { - int limit; - int nlimit; + int limit; + int nlimit; - limit = (blocksize - rootgap) / size; - nlimit = blocksize / size; - if (limit == nlimit) - limit--; - return limit; + limit = (blocksize - rootgap) / size; + nlimit = blocksize / size; + if (limit == nlimit) + limit--; + return limit; }