* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
* 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, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
*
* osd_iam.c
* Top-level entry points into osd module
#include <linux/module.h>
#include <asm/unaligned.h>
-#include <linux/dynlocks.h>
+
+#include "osd_dynlocks.h"
/*
- * linux/include/linux/osd_iam.h
+ * osd_iam.h
*/
-#ifndef CLASSERT
-#define CLASSERT(cond) do {switch(42) {case (cond): case 0: break;}} while (0)
-#endif
+
/* implication */
#define ergo(a, b) (!(a) || (b))
/* logical equivalence */
DX_FMT_NAME_LEN = 16,
};
-#ifdef __KERNEL__
/*
* Debugging.
* Parameters, describing a flavor of iam container.
*/
struct iam_descr {
- /*
- * Size of a key in this container, in bytes.
- */
- size_t id_key_size;
- /*
- * Size of a key in index nodes, in bytes.
- */
- size_t id_ikey_size;
- /*
- * Size of a pointer to the next level (stored in index nodes), in
- * bytes.
- */
- size_t id_ptr_size;
- /*
- * Size of a record (stored in leaf nodes), in bytes.
- */
- size_t id_rec_size;
- /*
- * Size of unused (by iam) space at the beginning of every non-root
- * node, in bytes. Used for compatibility with ldiskfs.
- */
- size_t id_node_gap;
- /*
- * Size of unused (by iam) space at the beginning of root node, in
- * bytes. Used for compatibility with ldiskfs.
- */
- size_t id_root_gap;
+ /*
+ * Size of a key in this container, in bytes.
+ */
+ size_t id_key_size;
+ /*
+ * Size of a key in index nodes, in bytes.
+ */
+ size_t id_ikey_size;
+ /*
+ * Size of a pointer to the next level (stored in index nodes), in
+ * bytes.
+ */
+ size_t id_ptr_size;
+ /*
+ * Size of a record (stored in leaf nodes), in bytes.
+ */
+ size_t id_rec_size;
+ /*
+ * Size of unused (by iam) space at the beginning of every non-root
+ * node, in bytes. Used for compatibility with ldiskfs.
+ */
+ size_t id_node_gap;
+ /*
+ * Size of unused (by iam) space at the beginning of root node, in
+ * bytes. Used for compatibility with ldiskfs.
+ */
+ size_t id_root_gap;
- struct iam_operations *id_ops;
- struct iam_leaf_operations *id_leaf_ops;
+ const struct iam_operations *id_ops;
+ const struct iam_leaf_operations *id_leaf_ops;
};
enum {
* container flavor.
*/
struct iam_descr *ic_descr;
- /*
- * read-write lock protecting index consistency.
- */
- struct rw_semaphore ic_sem;
struct dynlock ic_tree_lock;
- /*
- * Protect ic_idle_bh
- */
- struct semaphore ic_idle_sem;
+ /* Protect ic_idle_bh */
+ struct mutex ic_idle_mutex;
/*
* BH for idle blocks
*/
/*
* this iterator will move (iam_it_next() will be called on it)
*/
- IAM_IT_MOVE = (1 << 0),
+ IAM_IT_MOVE = BIT(0),
/*
* tree can be updated through this iterator.
*/
- IAM_IT_WRITE = (1 << 1)
+ IAM_IT_WRITE = BIT(1)
};
/*
return iam_leaf_container(leaf)->ic_descr;
}
-static inline struct iam_leaf_operations *
+static inline const struct iam_leaf_operations *
iam_leaf_ops(const struct iam_leaf *leaf)
{
- return iam_leaf_descr(leaf)->id_leaf_ops;
+ return iam_leaf_descr(leaf)->id_leaf_ops;
}
static inline void iam_reccpy(const struct iam_leaf *leaf,
static inline struct iam_ikey *iam_path_ikey(const struct iam_path *path,
int nr)
{
- assert(0 <= nr && nr < ARRAY_SIZE(path->ip_data->ipd_key_scratch));
+ LASSERT(0 <= nr && nr < ARRAY_SIZE(path->ip_data->ipd_key_scratch));
return path->ip_data->ipd_key_scratch[nr];
}
int ldiskfs_htree_next_block(struct inode *dir, __u32 hash,
struct iam_path *path, __u32 *start_hash);
-struct buffer_head *ldiskfs_append(handle_t *handle, struct inode *inode,
- u32 *block, int *err);
int split_index_node(handle_t *handle, struct iam_path *path,
struct dynlock_handle **lh);
struct ldiskfs_dir_entry_2 *split_entry(struct inode *dir,
/*
* external
*/
-void iam_container_write_lock(struct iam_container *c);
-void iam_container_write_unlock(struct iam_container *c);
-
-void iam_container_read_lock(struct iam_container *c);
-void iam_container_read_unlock(struct iam_container *c);
-
int iam_index_next(struct iam_container *c, struct iam_path *p);
int iam_read_leaf(struct iam_path *p);
#define dxtrace(command)
#endif
-#define BH_DXLock 25
+#define BH_DXLock (BH_BITMAP_UPTODATE + 1)
#define DX_DEBUG (0)
#if DX_DEBUG
static struct iam_lock_stats {
{
DX_DEVAL(iam_lock_stats.dls_bh_lock++);
#ifdef CONFIG_SMP
- while (test_and_set_bit(BH_DXLock, &bh->b_state)) {
+ while (test_and_set_bit_lock(BH_DXLock, &bh->b_state)) {
DX_DEVAL(iam_lock_stats.dls_bh_busy++);
while (test_bit(BH_DXLock, &bh->b_state))
cpu_relax();
static inline void iam_unlock_bh(struct buffer_head *bh)
{
#ifdef CONFIG_SMP
- smp_mb__before_clear_bit();
- clear_bit(BH_DXLock, &bh->b_state);
+ clear_bit_unlock(BH_DXLock, &bh->b_state);
#endif
}
struct iam_path *iam_leaf_path(const struct iam_leaf *leaf);
struct iam_container *iam_leaf_container(const struct iam_leaf *leaf);
struct iam_descr *iam_leaf_descr(const struct iam_leaf *leaf);
-struct iam_leaf_operations *iam_leaf_ops(const struct iam_leaf *leaf);
+const struct iam_leaf_operations *iam_leaf_ops(const struct iam_leaf *leaf);
int iam_node_read(struct iam_container *c, iam_ptr_t ptr,
handle_t *h, struct buffer_head **bh);
-/*
- * Container format.
- */
-struct iam_format {
- /*
- * Method called to recognize container format. Should return true iff
- * container @c conforms to this format. This method may do IO to read
- * container pages.
- *
- * If container is recognized, this method sets operation vectors
- * ->id_ops and ->id_leaf_ops in container description (c->ic_descr),
- * and fills other description fields.
- */
- int (*if_guess)(struct iam_container *c);
- /*
- * Linkage into global list of container formats.
- */
- cfs_list_t if_linkage;
-};
-
-void iam_format_register(struct iam_format *fmt);
int iam_root_limit(int rootgap, int blocksize, int size);
void iam_lfix_format_init(void);
void iam_lvar_format_init(void);
+int iam_lfix_guess(struct iam_container *c);
+int iam_lvar_guess(struct iam_container *c);
void iam_htree_format_init(void);
int iam_lfix_create(struct inode *obj,
extern int ldiskfs_check_dir_entry(const char *, struct inode *,
struct ldiskfs_dir_entry_2 *,
struct buffer_head *, unsigned long);
+extern int dx_node_check(struct iam_path *p, struct iam_frame *f);
#else
static inline int ldiskfs_check_dir_entry(const char * function,
struct inode * dir,
*/
/* __KERNEL__ */
-#endif
/*
* User level API. Copy exists in lustre/lustre/tests/iam_ut.c
git://git.whamcloud.com / fs / lustre-release.git / blobdiff