X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_iam.c;h=8a1fdf67c084275797a680e31c392a213c818946;hb=ecd28d9b6cb691bda8184a7e07f1acc1ccded391;hp=70514545c4adc31c1a1995f5dbd22061fdcf181c;hpb=9c6ebfd11be1cc11629a2960c8c818492e1f0980;p=fs%2Flustre-release.git diff --git a/lustre/osd-ldiskfs/osd_iam.c b/lustre/osd-ldiskfs/osd_iam.c index 7051454..8a1fdf6 100644 --- a/lustre/osd-ldiskfs/osd_iam.c +++ b/lustre/osd-ldiskfs/osd_iam.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) 2011, 2012, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -157,13 +157,12 @@ * * No locking. Callers synchronize. */ -static CFS_LIST_HEAD(iam_formats); +static struct list_head iam_formats = LIST_HEAD_INIT(iam_formats); void iam_format_register(struct iam_format *fmt) { - cfs_list_add(&fmt->if_linkage, &iam_formats); + list_add(&fmt->if_linkage, &iam_formats); } -EXPORT_SYMBOL(iam_format_register); static struct buffer_head * iam_load_idle_blocks(struct iam_container *c, iam_ptr_t blk) @@ -173,7 +172,7 @@ iam_load_idle_blocks(struct iam_container *c, iam_ptr_t blk) struct buffer_head *bh; int err; - LASSERT(down_trylock(&c->ic_idle_sem) != 0); + LASSERT(mutex_is_locked(&c->ic_idle_mutex)); if (blk == 0) return NULL; @@ -222,7 +221,7 @@ static int iam_format_guess(struct iam_container *c) } result = -ENOENT; - cfs_list_for_each_entry(fmt, &iam_formats, if_linkage) { + list_for_each_entry(fmt, &iam_formats, if_linkage) { result = fmt->if_guess(c); if (result == 0) break; @@ -237,13 +236,13 @@ static int iam_format_guess(struct iam_container *c) idle_blocks = (__u32 *)(c->ic_root_bh->b_data + c->ic_descr->id_root_gap + sizeof(struct dx_countlimit)); - down(&c->ic_idle_sem); + mutex_lock(&c->ic_idle_mutex); bh = iam_load_idle_blocks(c, le32_to_cpu(*idle_blocks)); if (bh != NULL && IS_ERR(bh)) result = PTR_ERR(bh); else c->ic_idle_bh = bh; - up(&c->ic_idle_sem); + mutex_unlock(&c->ic_idle_mutex); } return result; @@ -260,10 +259,9 @@ int iam_container_init(struct iam_container *c, c->ic_object = inode; init_rwsem(&c->ic_sem); dynlock_init(&c->ic_tree_lock); - sema_init(&c->ic_idle_sem, 1); + mutex_init(&c->ic_idle_mutex); return 0; } -EXPORT_SYMBOL(iam_container_init); /* * Determine container format. @@ -272,7 +270,6 @@ int iam_container_setup(struct iam_container *c) { return iam_format_guess(c); } -EXPORT_SYMBOL(iam_container_setup); /* * Finalize container @c, release all resources. @@ -284,7 +281,6 @@ void iam_container_fini(struct iam_container *c) brelse(c->ic_root_bh); c->ic_root_bh = NULL; } -EXPORT_SYMBOL(iam_container_fini); void iam_path_init(struct iam_path *path, struct iam_container *c, struct iam_path_descr *pd) @@ -350,12 +346,10 @@ struct iam_path_descr *iam_ipd_alloc(void *area, int keysize) ipd->ipd_key_scratch[i] = karea; return ipd; } -EXPORT_SYMBOL(iam_ipd_alloc); void iam_ipd_free(struct iam_path_descr *ipd) { } -EXPORT_SYMBOL(iam_ipd_free); int iam_node_read(struct iam_container *c, iam_ptr_t ptr, handle_t *h, struct buffer_head **bh) @@ -456,33 +450,33 @@ static int iam_path_check(struct iam_path *p) 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; - - c = path->ip_container; - leaf = &path->ip_leaf; - descr = iam_path_descr(path); - block = path->ip_frame->leaf; - if (block == 0) { - /* XXX bug 11027 */ - printk(CFS_KERN_EMERG "wrong leaf: %lu %d [%p %p %p]\n", - (long unsigned)path->ip_frame->leaf, - dx_get_count(dx_node_get_entries(path, path->ip_frame)), - path->ip_frames[0].bh, path->ip_frames[1].bh, - path->ip_frames[2].bh); - } - err = descr->id_ops->id_node_read(c, block, NULL, &bh); - if (err == 0) { - leaf->il_bh = bh; - leaf->il_curidx = block; - err = iam_leaf_ops(leaf)->init(leaf); - assert_inv(ergo(err == 0, iam_leaf_check(leaf))); - } - return err; + iam_ptr_t block; + int err; + struct iam_container *c; + struct buffer_head *bh; + struct iam_leaf *leaf; + struct iam_descr *descr; + + c = path->ip_container; + leaf = &path->ip_leaf; + descr = iam_path_descr(path); + block = path->ip_frame->leaf; + if (block == 0) { + /* XXX bug 11027 */ + printk(KERN_EMERG "wrong leaf: %lu %d [%p %p %p]\n", + (long unsigned)path->ip_frame->leaf, + dx_get_count(dx_node_get_entries(path, path->ip_frame)), + path->ip_frames[0].bh, path->ip_frames[1].bh, + path->ip_frames[2].bh); + } + err = descr->id_ops->id_node_read(c, block, NULL, &bh); + if (err == 0) { + leaf->il_bh = bh; + leaf->il_curidx = block; + err = iam_leaf_ops(leaf)->init(leaf); + assert_inv(ergo(err == 0, iam_leaf_check(leaf))); + } + return err; } static void iam_unlock_htree(struct iam_container *ic, @@ -543,7 +537,8 @@ int iam_leaf_at_end(const struct iam_leaf *leaf) return iam_leaf_ops(leaf)->at_end(leaf); } -void iam_leaf_split(struct iam_leaf *l, struct buffer_head **bh, iam_ptr_t nr) +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); } @@ -604,7 +599,7 @@ static int iam_txn_dirty(handle_t *handle, { int result; - result = ldiskfs_journal_dirty_metadata(handle, bh); + result = ldiskfs_handle_dirty_metadata(handle, NULL, bh); if (result != 0) ldiskfs_std_error(iam_path_obj(path)->i_sb, result); return result; @@ -724,7 +719,6 @@ int iam_it_init(struct iam_iterator *it, struct iam_container *c, __u32 flags, iam_path_init(&it->ii_path, c, pd); return 0; } -EXPORT_SYMBOL(iam_it_init); /* * Finalize iterator and release all resources. @@ -736,7 +730,6 @@ void iam_it_fini(struct iam_iterator *it) assert_corr(it_state(it) == IAM_IT_DETACHED); iam_path_fini(&it->ii_path); } -EXPORT_SYMBOL(iam_it_fini); /* * this locking primitives are used to protect parts @@ -749,7 +742,7 @@ static struct dynlock_handle *iam_lock_htree(struct iam_container *ic, return dynlock_lock(&ic->ic_tree_lock, value, lt, GFP_NOFS); } -int iam_index_lock(struct iam_path *path, struct dynlock_handle **lh) +static int iam_index_lock(struct iam_path *path, struct dynlock_handle **lh) { struct iam_frame *f; @@ -809,8 +802,8 @@ int dx_index_is_compat(struct iam_path *path) * */ -struct iam_entry *iam_find_position(struct iam_path *path, - struct iam_frame *frame) +static struct iam_entry *iam_find_position(struct iam_path *path, + struct iam_frame *frame) { int count; struct iam_entry *p; @@ -1036,8 +1029,8 @@ static int iam_check_full_path(struct iam_path *path, int search) * Performs path lookup and returns with found leaf (if any) locked by htree * lock. */ -int iam_lookup_lock(struct iam_path *path, - struct dynlock_handle **dl, enum dynlock_type lt) +static int iam_lookup_lock(struct iam_path *path, + struct dynlock_handle **dl, enum dynlock_type lt) { int result; @@ -1195,7 +1188,6 @@ int iam_it_get(struct iam_iterator *it, const struct iam_key *k) it_keycmp(it, k) <= 0)); return result; } -EXPORT_SYMBOL(iam_it_get); /* * Attach iterator by index key. @@ -1234,7 +1226,6 @@ int iam_it_get_at(struct iam_iterator *it, const struct iam_key *k) assert_corr(ergo(result >= 0, it_state(it) == IAM_IT_ATTACHED)); return result; } -EXPORT_SYMBOL(iam_it_get_at); /* * Duplicates iterator. @@ -1275,7 +1266,6 @@ void iam_it_put(struct iam_iterator *it) iam_leaf_fini(&it->ii_path.ip_leaf); } } -EXPORT_SYMBOL(iam_it_put); static struct iam_ikey *iam_it_ikey_get(const struct iam_iterator *it, struct iam_ikey *ikey); @@ -1411,7 +1401,7 @@ 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; - struct dynlock_handle *lh[DX_MAX_TREE_HEIGHT] = { 0, }; + struct dynlock_handle *lh[DX_MAX_TREE_HEIGHT] = { NULL, }; int result; struct inode *object; @@ -1553,7 +1543,6 @@ int iam_it_next(struct iam_iterator *it) it_ikeycmp(it, ik_orig) >= 0)); return result; } -EXPORT_SYMBOL(iam_it_next); /* * Return pointer to the record under iterator. @@ -1567,7 +1556,6 @@ struct iam_rec *iam_it_rec_get(const struct iam_iterator *it) assert_corr(it_at_rec(it)); return iam_leaf_rec(&it->ii_path.ip_leaf); } -EXPORT_SYMBOL(iam_it_rec_get); static void iam_it_reccpy(struct iam_iterator *it, const struct iam_rec *r) { @@ -1605,7 +1593,6 @@ int iam_it_rec_set(handle_t *h, } return result; } -EXPORT_SYMBOL(iam_it_rec_set); /* * Return pointer to the index key under iterator. @@ -1635,7 +1622,6 @@ struct iam_key *iam_it_key_get(const struct iam_iterator *it) assert_corr(it_at_rec(it)); return iam_leaf_key(&it->ii_path.ip_leaf); } -EXPORT_SYMBOL(iam_it_key_get); /* * Return size of key under iterator (in bytes) @@ -1650,9 +1636,8 @@ int iam_it_key_size(const struct iam_iterator *it) assert_corr(it_at_rec(it)); return iam_leaf_key_size(&it->ii_path.ip_leaf); } -EXPORT_SYMBOL(iam_it_key_size); -struct buffer_head * +static struct buffer_head * iam_new_node(handle_t *h, struct iam_container *c, iam_ptr_t *b, int *e) { struct inode *inode = c->ic_object; @@ -1665,9 +1650,9 @@ iam_new_node(handle_t *h, struct iam_container *c, iam_ptr_t *b, int *e) if (c->ic_idle_bh == NULL) goto newblock; - down(&c->ic_idle_sem); + mutex_lock(&c->ic_idle_mutex); if (unlikely(c->ic_idle_bh == NULL)) { - up(&c->ic_idle_sem); + mutex_unlock(&c->ic_idle_mutex); goto newblock; } @@ -1681,11 +1666,11 @@ iam_new_node(handle_t *h, struct iam_container *c, iam_ptr_t *b, int *e) --count; *b = le32_to_cpu(head->iih_blks[count]); head->iih_count = cpu_to_le16(count); - *e = ldiskfs_journal_dirty_metadata(h, c->ic_idle_bh); + *e = ldiskfs_handle_dirty_metadata(h, inode, c->ic_idle_bh); if (*e != 0) goto fail; - up(&c->ic_idle_sem); + mutex_unlock(&c->ic_idle_mutex); bh = ldiskfs_bread(NULL, inode, *b, 0, e); if (bh == NULL) return NULL; @@ -1705,7 +1690,7 @@ iam_new_node(handle_t *h, struct iam_container *c, iam_ptr_t *b, int *e) iam_lock_bh(c->ic_root_bh); *idle_blocks = head->iih_next; iam_unlock_bh(c->ic_root_bh); - *e = ldiskfs_journal_dirty_metadata(h, c->ic_root_bh); + *e = ldiskfs_handle_dirty_metadata(h, inode, c->ic_root_bh); if (*e != 0) { iam_lock_bh(c->ic_root_bh); *idle_blocks = cpu_to_le32(*b); @@ -1723,7 +1708,7 @@ iam_new_node(handle_t *h, struct iam_container *c, iam_ptr_t *b, int *e) } c->ic_idle_bh = idle; - up(&c->ic_idle_sem); + mutex_unlock(&c->ic_idle_mutex); got: /* get write access for the found buffer head */ @@ -1740,11 +1725,11 @@ got: return bh; newblock: - bh = ldiskfs_append(h, inode, b, e); + bh = osd_ldiskfs_append(h, inode, b, e); return bh; fail: - up(&c->ic_idle_sem); + mutex_unlock(&c->ic_idle_mutex); ldiskfs_std_error(inode->i_sb, *e); return NULL; } @@ -1892,8 +1877,8 @@ int split_index_node(handle_t *handle, struct iam_path *path, 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] = {0}; + 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,}; @@ -2067,7 +2052,7 @@ int split_index_node(handle_t *handle, struct iam_path *path, ++ frame; assert_inv(dx_node_check(path, frame)); bh_new[0] = NULL; /* buffer head is "consumed" */ - err = ldiskfs_journal_dirty_metadata(handle, bh2); + err = ldiskfs_handle_dirty_metadata(handle, NULL, bh2); if (err) goto journal_error; do_corr(schedule()); @@ -2099,16 +2084,17 @@ int split_index_node(handle_t *handle, struct iam_path *path, dxtrace(dx_show_index ("node", frame->entries)); dxtrace(dx_show_index ("node", ((struct dx_node *) bh2->b_data)->entries)); - err = ldiskfs_journal_dirty_metadata(handle, bh2); + err = ldiskfs_handle_dirty_metadata(handle, NULL, bh2); if (err) goto journal_error; do_corr(schedule()); - err = ldiskfs_journal_dirty_metadata(handle, parent->bh); + err = ldiskfs_handle_dirty_metadata(handle, NULL, + parent->bh); if (err) goto journal_error; } do_corr(schedule()); - err = ldiskfs_journal_dirty_metadata(handle, bh); + err = ldiskfs_handle_dirty_metadata(handle, NULL, bh); if (err) goto journal_error; } @@ -2241,7 +2227,6 @@ int iam_it_rec_insert(handle_t *h, struct iam_iterator *it, it_keycmp(it, k) == 0)); return result; } -EXPORT_SYMBOL(iam_it_rec_insert); static inline int iam_idle_blocks_limit(struct inode *inode) { @@ -2382,7 +2367,7 @@ static void iam_recycle_leaf(handle_t *h, struct iam_path *p, int count; int rc; - down(&c->ic_idle_sem); + mutex_lock(&c->ic_idle_mutex); if (unlikely(c->ic_idle_failed)) { rc = -EFAULT; goto unlock; @@ -2415,7 +2400,7 @@ static void iam_recycle_leaf(handle_t *h, struct iam_path *p, rc = iam_txn_dirty(h, p, c->ic_idle_bh); unlock: - up(&c->ic_idle_sem); + 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); @@ -2476,7 +2461,6 @@ int iam_it_rec_delete(handle_t *h, struct iam_iterator *it) it_state(it) == IAM_IT_DETACHED); return result; } -EXPORT_SYMBOL(iam_it_rec_delete); /* * Convert iterator to cookie. @@ -2497,7 +2481,6 @@ iam_pos_t iam_it_store(const struct iam_iterator *it) result = 0; return *(iam_pos_t *)iam_it_ikey_get(it, (void *)&result); } -EXPORT_SYMBOL(iam_it_store); /* * Restore iterator from cookie. @@ -2514,7 +2497,6 @@ int iam_it_load(struct iam_iterator *it, iam_pos_t pos) assert_corr(iam_it_container(it)->ic_descr->id_ikey_size <= sizeof pos); return iam_it_iget(it, (struct iam_ikey *)&pos); } -EXPORT_SYMBOL(iam_it_load); /***********************************************************************/ /* invariants */ @@ -2525,7 +2507,7 @@ static inline int ptr_inside(void *base, size_t size, void *ptr) return (base <= ptr) && (ptr < base + size); } -int iam_frame_invariant(struct iam_frame *f) +static int iam_frame_invariant(struct iam_frame *f) { return (f->bh != NULL && @@ -2534,7 +2516,8 @@ int iam_frame_invariant(struct iam_frame *f) ptr_inside(f->bh->b_data, f->bh->b_size, f->at) && f->entries <= f->at); } -int iam_leaf_invariant(struct iam_leaf *l) + +static int iam_leaf_invariant(struct iam_leaf *l) { return l->il_bh != NULL && @@ -2544,7 +2527,7 @@ int iam_leaf_invariant(struct iam_leaf *l) l->il_entries <= l->il_at; } -int iam_path_invariant(struct iam_path *p) +static int iam_path_invariant(struct iam_path *p) { int i; @@ -2599,7 +2582,6 @@ int iam_lookup(struct iam_container *c, const struct iam_key *k, iam_it_fini(&it); return result; } -EXPORT_SYMBOL(iam_lookup); /* * Insert new record @r with key @k into container @c (within context of @@ -2628,7 +2610,6 @@ int iam_insert(handle_t *h, struct iam_container *c, const struct iam_key *k, iam_it_fini(&it); return result; } -EXPORT_SYMBOL(iam_insert); /* * Update record with the key @k in container @c (within context of @@ -2659,7 +2640,6 @@ int iam_update(handle_t *h, struct iam_container *c, const struct iam_key *k, iam_it_fini(&it); return result; } -EXPORT_SYMBOL(iam_update); /* * Delete existing record with key @k. @@ -2684,7 +2664,6 @@ int iam_delete(handle_t *h, struct iam_container *c, const struct iam_key *k, iam_it_fini(&it); return result; } -EXPORT_SYMBOL(iam_delete); int iam_root_limit(int rootgap, int blocksize, int size) {