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-7261 ldiskfs: fix large_xattr overwrite
[fs/lustre-release.git]
/
lustre
/
osc
/
osc_quota.c
diff --git
a/lustre/osc/osc_quota.c
b/lustre/osc/osc_quota.c
index
1524ea7
..
2446587
100644
(file)
--- a/
lustre/osc/osc_quota.c
+++ b/
lustre/osc/osc_quota.c
@@
-110,7
+110,7
@@
int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[],
}
CDEBUG(D_QUOTA, "%s: setdq to insert for %s %d (%d)\n",
}
CDEBUG(D_QUOTA, "%s: setdq to insert for %s %d (%d)\n",
- cli
->cl_import->imp_obd->obd_name
,
+ cli
_name(cli)
,
type == USRQUOTA ? "user" : "group",
qid[type], rc);
} else {
type == USRQUOTA ? "user" : "group",
qid[type], rc);
} else {
@@
-125,7
+125,7
@@
int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[],
OBD_SLAB_FREE_PTR(oqi, osc_quota_kmem);
CDEBUG(D_QUOTA, "%s: setdq to remove for %s %d (%p)\n",
OBD_SLAB_FREE_PTR(oqi, osc_quota_kmem);
CDEBUG(D_QUOTA, "%s: setdq to remove for %s %d (%p)\n",
- cli
->cl_import->imp_obd->obd_name
,
+ cli
_name(cli)
,
type == USRQUOTA ? "user" : "group",
qid[type], oqi);
}
type == USRQUOTA ? "user" : "group",
qid[type], oqi);
}
@@
-138,7
+138,7
@@
int osc_quota_setdq(struct client_obd *cli, const unsigned int qid[],
* Hash operations for uid/gid <-> osc_quota_info
*/
static unsigned
* Hash operations for uid/gid <-> osc_quota_info
*/
static unsigned
-oqi_hashfn(
cfs_hash_t
*hs, const void *key, unsigned mask)
+oqi_hashfn(
struct cfs_hash
*hs, const void *key, unsigned mask)
{
return cfs_hash_u32_hash(*((__u32*)key), mask);
}
{
return cfs_hash_u32_hash(*((__u32*)key), mask);
}
@@
-171,17
+171,17
@@
oqi_object(struct hlist_node *hnode)
}
static void
}
static void
-oqi_get(
cfs_hash_t
*hs, struct hlist_node *hnode)
+oqi_get(
struct cfs_hash
*hs, struct hlist_node *hnode)
{
}
static void
{
}
static void
-oqi_put_locked(
cfs_hash_t
*hs, struct hlist_node *hnode)
+oqi_put_locked(
struct cfs_hash
*hs, struct hlist_node *hnode)
{
}
static void
{
}
static void
-oqi_exit(
cfs_hash_t
*hs, struct hlist_node *hnode)
+oqi_exit(
struct cfs_hash
*hs, struct hlist_node *hnode)
{
struct osc_quota_info *oqi;
{
struct osc_quota_info *oqi;
@@
-194,7
+194,7
@@
oqi_exit(cfs_hash_t *hs, struct hlist_node *hnode)
#define HASH_QUOTA_CUR_BITS 5
#define HASH_QUOTA_MAX_BITS 15
#define HASH_QUOTA_CUR_BITS 5
#define HASH_QUOTA_MAX_BITS 15
-static
cfs_hash_ops_t
quota_hash_ops = {
+static
struct cfs_hash_ops
quota_hash_ops = {
.hs_hash = oqi_hashfn,
.hs_keycmp = oqi_keycmp,
.hs_key = oqi_key,
.hs_hash = oqi_hashfn,
.hs_keycmp = oqi_keycmp,
.hs_key = oqi_key,