Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-8468 kernel: kernel update RHEL7.2 [3.10.0-327.28.2.el7]
[fs/lustre-release.git]
/
lustre
/
lod
/
lod_pool.c
diff --git
a/lustre/lod/lod_pool.c
b/lustre/lod/lod_pool.c
index
6eaa6d7
..
da5389c
100644
(file)
--- a/
lustre/lod/lod_pool.c
+++ b/
lustre/lod/lod_pool.c
@@
-96,8
+96,8
@@
void lod_pool_putref(struct pool_desc *pool)
{
CDEBUG(D_INFO, "pool %p\n", pool);
if (atomic_dec_and_test(&pool->pool_refcount)) {
- LASSERT(
cfs_
hlist_unhashed(&pool->pool_hash));
- LASSERT(
cfs_
list_empty(&pool->pool_list));
+ LASSERT(hlist_unhashed(&pool->pool_hash));
+ LASSERT(list_empty(&pool->pool_list));
LASSERT(pool->pool_proc_entry == NULL);
lod_ost_pool_free(&(pool->pool_rr.lqr_pool));
lod_ost_pool_free(&(pool->pool_obds));
@@
-132,11
+132,7
@@
static void pool_putref_locked(struct pool_desc *pool)
/**
* Hash the pool name for use by the cfs_hash handlers.
*
- * hash function using a Rotating Hash algorithm
- * Knuth, D. The Art of Computer Programming,
- * Volume 3: Sorting and Searching,
- * Chapter 6.4.
- * Addison Wesley, 1973
+ * Use the standard DJB2 hash function for ASCII strings in Lustre.
*
* \param[in] hash_body hash structure where this key is embedded (unused)
* \param[in] key key to be hashed (in this case the pool name)
@@
-144,20
+140,10
@@
static void pool_putref_locked(struct pool_desc *pool)
*
* \retval computed hash value from \a key and limited by \a mask
*/
-static __u32 pool_hashfn(cfs_hash_t *hash_body, const void *key, unsigned mask)
+static __u32 pool_hashfn(struct cfs_hash *hash_body, const void *key,
+ unsigned mask)
{
- int i;
- __u32 result;
- char *poolname;
-
- result = 0;
- poolname = (char *)key;
- for (i = 0; i < LOV_MAXPOOLNAME; i++) {
- if (poolname[i] == '\0')
- break;
- result = (result << 4) ^ (result >> 28) ^ poolname[i];
- }
- return result % mask;
+ return cfs_hash_djb2_hash(key, strnlen(key, LOV_MAXPOOLNAME), mask);
}
/**
@@
-169,11
+155,11
@@
static __u32 pool_hashfn(cfs_hash_t *hash_body, const void *key, unsigned mask)
*
* \retval char array referencing the pool name (no refcount)
*/
-static void *pool_key(
cfs_hlist_node_t
*hnode)
+static void *pool_key(
struct hlist_node
*hnode)
{
struct pool_desc *pool;
- pool =
cfs_
hlist_entry(hnode, struct pool_desc, pool_hash);
+ pool = hlist_entry(hnode, struct pool_desc, pool_hash);
return pool->pool_name;
}
@@
-189,14
+175,9
@@
static void *pool_key(cfs_hlist_node_t *hnode)
* \retval 0 if \a key is the same as the key of \a compared
* \retval 1 if \a key is different from the key of \a compared
*/
-static int pool_hashkey_keycmp(const void *key,
cfs_hlist_node_t *compared_hnode
)
+static int pool_hashkey_keycmp(const void *key,
struct hlist_node *compared
)
{
- char *pool_name;
- struct pool_desc *pool;
-
- pool_name = (char *)key;
- pool = cfs_hlist_entry(compared_hnode, struct pool_desc, pool_hash);
- return !strncmp(pool_name, pool->pool_name, LOV_MAXPOOLNAME);
+ return !strncmp(key, pool_key(compared), LOV_MAXPOOLNAME);
}
/**
@@
-210,29
+191,29
@@
static int pool_hashkey_keycmp(const void *key, cfs_hlist_node_t *compared_hnode
*
* \retval struct pool_desc for the specified \a hnode
*/
-static void *pool_hashobject(
cfs_hlist_node_t
*hnode)
+static void *pool_hashobject(
struct hlist_node
*hnode)
{
- return
cfs_
hlist_entry(hnode, struct pool_desc, pool_hash);
+ return hlist_entry(hnode, struct pool_desc, pool_hash);
}
-static void pool_hashrefcount_get(
cfs_hash_t *hs, cfs_hlist_node_t
*hnode)
+static void pool_hashrefcount_get(
struct cfs_hash *hs, struct hlist_node
*hnode)
{
struct pool_desc *pool;
- pool =
cfs_
hlist_entry(hnode, struct pool_desc, pool_hash);
+ pool = hlist_entry(hnode, struct pool_desc, pool_hash);
pool_getref(pool);
}
-static void pool_hashrefcount_put_locked(
cfs_hash_t
*hs,
-
cfs_hlist_node_t
*hnode)
+static void pool_hashrefcount_put_locked(
struct cfs_hash
*hs,
+
struct hlist_node
*hnode)
{
struct pool_desc *pool;
- pool =
cfs_
hlist_entry(hnode, struct pool_desc, pool_hash);
+ pool = hlist_entry(hnode, struct pool_desc, pool_hash);
pool_putref_locked(pool);
}
-
cfs_hash_ops_t
pool_hash_operations = {
+
struct cfs_hash_ops
pool_hash_operations = {
.hs_hash = pool_hashfn,
.hs_key = pool_key,
.hs_keycmp = pool_hashkey_keycmp,
@@
-247,8
+228,8
@@
cfs_hash_ops_t pool_hash_operations = {
#define POOL_IT_MAGIC 0xB001CEA0
struct lod_pool_iterator {
-
int
lpi_magic; /* POOL_IT_MAGIC */
-
int
lpi_idx; /* from 0 to pool_tgt_size - 1 */
+
unsigned int
lpi_magic; /* POOL_IT_MAGIC */
+
unsigned int
lpi_idx; /* from 0 to pool_tgt_size - 1 */
struct pool_desc *lpi_pool;
};
@@
-449,7
+430,7
@@
static struct file_operations pool_proc_operations = {
*/
void lod_dump_pool(int level, struct pool_desc *pool)
{
- int i;
+
unsigned
int i;
pool_getref(pool);
@@
-555,7
+536,8
@@
int lod_ost_pool_extend(struct ost_pool *op, unsigned int min_count)
*/
int lod_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count)
{
- int rc = 0, i;
+ unsigned int i;
+ int rc = 0;
ENTRY;
down_write(&op->op_rw_sem);
@@
-594,7
+576,7
@@
out:
*/
int lod_ost_pool_remove(struct ost_pool *op, __u32 idx)
{
- int i;
+
unsigned
int i;
ENTRY;
down_write(&op->op_rw_sem);
@@
-679,21
+661,17
@@
int lod_pool_new(struct obd_device *obd, char *poolname)
if (rc)
GOTO(out_err, rc);
-
memset(&new_pool->pool_rr, 0, sizeof(new_pool->pool_rr)
);
+
lod_qos_rr_init(&new_pool->pool_rr
);
rc = lod_ost_pool_init(&new_pool->pool_rr.lqr_pool, 0);
if (rc)
GOTO(out_free_pool_obds, rc);
INIT_HLIST_NODE(&new_pool->pool_hash);
-#ifdef
LPROC
FS
+#ifdef
CONFIG_PROC_
FS
pool_getref(new_pool);
new_pool->pool_proc_entry = lprocfs_add_simple(lod->lod_pool_proc_entry,
- poolname,
-#ifndef HAVE_ONLY_PROCFS_SEQ
- NULL, NULL,
-#endif
- new_pool,
+ poolname, new_pool,
&pool_proc_operations);
if (IS_ERR(new_pool->pool_proc_entry)) {
CDEBUG(D_CONFIG, "%s: cannot add proc entry "LOV_POOLNAMEF"\n",
@@
-706,7
+684,7
@@
int lod_pool_new(struct obd_device *obd, char *poolname)
#endif
spin_lock(&obd->obd_dev_lock);
-
cfs_
list_add_tail(&new_pool->pool_list, &lod->lod_pool_list);
+ list_add_tail(&new_pool->pool_list, &lod->lod_pool_list);
lod->lod_pool_count++;
spin_unlock(&obd->obd_dev_lock);
@@
-723,7
+701,7
@@
int lod_pool_new(struct obd_device *obd, char *poolname)
out_err:
spin_lock(&obd->obd_dev_lock);
-
cfs_
list_del_init(&new_pool->pool_list);
+ list_del_init(&new_pool->pool_list);
lod->lod_pool_count--;
spin_unlock(&obd->obd_dev_lock);
@@
-763,7
+741,7
@@
int lod_pool_del(struct obd_device *obd, char *poolname)
}
spin_lock(&obd->obd_dev_lock);
-
cfs_
list_del_init(&pool->pool_list);
+ list_del_init(&pool->pool_list);
lod->lod_pool_count--;
spin_unlock(&obd->obd_dev_lock);
@@
-897,7
+875,8
@@
out:
*/
int lod_check_index_in_pool(__u32 idx, struct pool_desc *pool)
{
- int i, rc;
+ unsigned int i;
+ int rc;
ENTRY;
pool_getref(pool);