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
Revert "LU-6245 libcfs: remove cfs_fs_time handling"
[fs/lustre-release.git]
/
lustre
/
lod
/
lod_pool.c
diff --git
a/lustre/lod/lod_pool.c
b/lustre/lod/lod_pool.c
index
19e473f
..
da5389c
100644
(file)
--- a/
lustre/lod/lod_pool.c
+++ b/
lustre/lod/lod_pool.c
@@
-140,7
+140,8
@@
static void pool_putref_locked(struct pool_desc *pool)
*
* \retval computed hash value from \a key and limited by \a mask
*/
*
* \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)
{
return cfs_hash_djb2_hash(key, strnlen(key, LOV_MAXPOOLNAME), mask);
}
{
return cfs_hash_djb2_hash(key, strnlen(key, LOV_MAXPOOLNAME), mask);
}
@@
-195,7
+196,7
@@
static void *pool_hashobject(struct hlist_node *hnode)
return 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, struct hlist_node *hnode)
+static void pool_hashrefcount_get(
struct cfs_hash
*hs, struct hlist_node *hnode)
{
struct pool_desc *pool;
{
struct pool_desc *pool;
@@
-203,7
+204,7
@@
static void pool_hashrefcount_get(cfs_hash_t *hs, struct hlist_node *hnode)
pool_getref(pool);
}
pool_getref(pool);
}
-static void pool_hashrefcount_put_locked(
cfs_hash_t
*hs,
+static void pool_hashrefcount_put_locked(
struct cfs_hash
*hs,
struct hlist_node *hnode)
{
struct pool_desc *pool;
struct hlist_node *hnode)
{
struct pool_desc *pool;
@@
-212,7
+213,7
@@
static void pool_hashrefcount_put_locked(cfs_hash_t *hs,
pool_putref_locked(pool);
}
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,
.hs_hash = pool_hashfn,
.hs_key = pool_key,
.hs_keycmp = pool_hashkey_keycmp,
@@
-660,7
+661,7
@@
int lod_pool_new(struct obd_device *obd, char *poolname)
if (rc)
GOTO(out_err, rc);
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);
rc = lod_ost_pool_init(&new_pool->pool_rr.lqr_pool, 0);
if (rc)
GOTO(out_free_pool_obds, rc);