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-13117 libcfs: fix to match right key in cfs_get_environ()
[fs/lustre-release.git]
/
lustre
/
quota
/
lquota_entry.c
diff --git
a/lustre/quota/lquota_entry.c
b/lustre/quota/lquota_entry.c
index
92a9c6e
..
ee73c16
100644
(file)
--- a/
lustre/quota/lquota_entry.c
+++ b/
lustre/quota/lquota_entry.c
@@
-100,12
+100,15
@@
void lquota_lqe_debug0(struct lquota_entry *lqe,
const char *fmt, ...)
{
struct lquota_site *site = lqe->lqe_site;
const char *fmt, ...)
{
struct lquota_site *site = lqe->lqe_site;
+ struct va_format vaf;
va_list args;
LASSERT(site->lqs_ops->lqe_debug != NULL);
va_start(args, fmt);
va_list args;
LASSERT(site->lqs_ops->lqe_debug != NULL);
va_start(args, fmt);
- site->lqs_ops->lqe_debug(lqe, site->lqs_parent, msgdata, fmt, args);
+ vaf.fmt = fmt;
+ vaf.va = &args;
+ site->lqs_ops->lqe_debug(lqe, site->lqs_parent, msgdata, &vaf);
va_end(args);
}
va_end(args);
}
@@
-225,7
+228,11
@@
struct lquota_site *lquota_site_alloc(const struct lu_env *env, void *parent,
HASH_LQE_BKT_BITS),
0, CFS_HASH_MIN_THETA,
CFS_HASH_MAX_THETA, &lqe64_hash_ops,
HASH_LQE_BKT_BITS),
0, CFS_HASH_MIN_THETA,
CFS_HASH_MAX_THETA, &lqe64_hash_ops,
- CFS_HASH_DEFAULT|CFS_HASH_BIGNAME);
+ CFS_HASH_RW_SEM_BKTLOCK |
+ CFS_HASH_COUNTER |
+ CFS_HASH_REHASH |
+ CFS_HASH_BIGNAME);
+
if (site->lqs_hash == NULL) {
OBD_FREE_PTR(site);
RETURN(ERR_PTR(-ENOMEM));
if (site->lqs_hash == NULL) {
OBD_FREE_PTR(site);
RETURN(ERR_PTR(-ENOMEM));
@@
-326,7
+333,7
@@
struct lquota_entry *lqe_locate(const struct lu_env *env,
OBD_SLAB_ALLOC_PTR_GFP(new, lqe_kmem, GFP_NOFS);
if (new == NULL) {
OBD_SLAB_ALLOC_PTR_GFP(new, lqe_kmem, GFP_NOFS);
if (new == NULL) {
- CERROR("Fail to allocate lqe for id:
"LPU64"
, "
+ CERROR("Fail to allocate lqe for id:
%llu
, "
"hash:%s\n", qid->qid_uid, site->lqs_hash->hs_name);
RETURN(ERR_PTR(-ENOMEM));
}
"hash:%s\n", qid->qid_uid, site->lqs_hash->hs_name);
RETURN(ERR_PTR(-ENOMEM));
}