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
b=22668 test_65b fix
[fs/lustre-release.git]
/
lustre
/
fld
/
fld_request.c
diff --git
a/lustre/fld/fld_request.c
b/lustre/fld/fld_request.c
index
dff5498
..
951f589
100644
(file)
--- a/
lustre/fld/fld_request.c
+++ b/
lustre/fld/fld_request.c
@@
-74,9
+74,9
@@
static int fld_req_avail(struct client_obd *cli, struct mdc_cache_waiter *mcw)
{
int rc;
ENTRY;
-
spin
_lock(&cli->cl_loi_list_lock);
- rc = list_empty(&mcw->mcw_entry);
-
spin
_unlock(&cli->cl_loi_list_lock);
+
client_obd_list
_lock(&cli->cl_loi_list_lock);
+ rc =
cfs_
list_empty(&mcw->mcw_entry);
+
client_obd_list
_unlock(&cli->cl_loi_list_lock);
RETURN(rc);
};
@@
-85,38
+85,38
@@
static void fld_enter_request(struct client_obd *cli)
struct mdc_cache_waiter mcw;
struct l_wait_info lwi = { 0 };
-
spin
_lock(&cli->cl_loi_list_lock);
+
client_obd_list
_lock(&cli->cl_loi_list_lock);
if (cli->cl_r_in_flight >= cli->cl_max_rpcs_in_flight) {
- list_add_tail(&mcw.mcw_entry, &cli->cl_cache_waiters);
+
cfs_
list_add_tail(&mcw.mcw_entry, &cli->cl_cache_waiters);
cfs_waitq_init(&mcw.mcw_waitq);
-
spin
_unlock(&cli->cl_loi_list_lock);
+
client_obd_list
_unlock(&cli->cl_loi_list_lock);
l_wait_event(mcw.mcw_waitq, fld_req_avail(cli, &mcw), &lwi);
} else {
cli->cl_r_in_flight++;
-
spin
_unlock(&cli->cl_loi_list_lock);
+
client_obd_list
_unlock(&cli->cl_loi_list_lock);
}
}
static void fld_exit_request(struct client_obd *cli)
{
-
struct list_head
*l, *tmp;
+
cfs_list_t
*l, *tmp;
struct mdc_cache_waiter *mcw;
-
spin
_lock(&cli->cl_loi_list_lock);
+
client_obd_list
_lock(&cli->cl_loi_list_lock);
cli->cl_r_in_flight--;
- list_for_each_safe(l, tmp, &cli->cl_cache_waiters) {
+
cfs_
list_for_each_safe(l, tmp, &cli->cl_cache_waiters) {
if (cli->cl_r_in_flight >= cli->cl_max_rpcs_in_flight) {
/* No free request slots anymore */
break;
}
- mcw = list_entry(l, struct mdc_cache_waiter, mcw_entry);
- list_del_init(&mcw->mcw_entry);
+ mcw =
cfs_
list_entry(l, struct mdc_cache_waiter, mcw_entry);
+
cfs_
list_del_init(&mcw->mcw_entry);
cli->cl_r_in_flight++;
cfs_waitq_signal(&mcw->mcw_waitq);
}
-
spin
_unlock(&cli->cl_loi_list_lock);
+
client_obd_list
_unlock(&cli->cl_loi_list_lock);
}
static int fld_rrb_hash(struct lu_client_fld *fld,
@@
-135,7
+135,7
@@
fld_rrb_scan(struct lu_client_fld *fld, seqno_t seq)
hash = fld_rrb_hash(fld, seq);
- list_for_each_entry(target, &fld->lcf_targets, ft_chain) {
+
cfs_
list_for_each_entry(target, &fld->lcf_targets, ft_chain) {
if (target->ft_idx == hash)
RETURN(target);
}
@@
-144,7
+144,7
@@
fld_rrb_scan(struct lu_client_fld *fld, seqno_t seq)
"Targets (%d):\n", fld->lcf_name, hash, seq,
fld->lcf_count);
- list_for_each_entry(target, &fld->lcf_targets, ft_chain) {
+
cfs_
list_for_each_entry(target, &fld->lcf_targets, ft_chain) {
const char *srv_name = target->ft_srv != NULL ?
target->ft_srv->lsf_name : "<null>";
const char *exp_name = target->ft_exp != NULL ?
@@
-184,9
+184,9
@@
fld_client_get_target(struct lu_client_fld *fld,
LASSERT(fld->lcf_hash != NULL);
- spin_lock(&fld->lcf_lock);
+
cfs_
spin_lock(&fld->lcf_lock);
target = fld->lcf_hash->fh_scan_func(fld, seq);
- spin_unlock(&fld->lcf_lock);
+
cfs_
spin_unlock(&fld->lcf_lock);
if (target != NULL) {
CDEBUG(D_INFO, "%s: Found target (idx "LPU64
@@
-226,10
+226,10
@@
int fld_client_add_target(struct lu_client_fld *fld,
if (target == NULL)
RETURN(-ENOMEM);
- spin_lock(&fld->lcf_lock);
- list_for_each_entry(tmp, &fld->lcf_targets, ft_chain) {
+
cfs_
spin_lock(&fld->lcf_lock);
+
cfs_
list_for_each_entry(tmp, &fld->lcf_targets, ft_chain) {
if (tmp->ft_idx == tar->ft_idx) {
- spin_unlock(&fld->lcf_lock);
+
cfs_
spin_unlock(&fld->lcf_lock);
OBD_FREE_PTR(target);
CERROR("Target %s exists in FLD and known as %s:#"LPU64"\n",
name, fld_target_name(tmp), tmp->ft_idx);
@@
-243,11
+243,11
@@
int fld_client_add_target(struct lu_client_fld *fld,
target->ft_srv = tar->ft_srv;
target->ft_idx = tar->ft_idx;
- list_add_tail(&target->ft_chain,
- &fld->lcf_targets);
+
cfs_
list_add_tail(&target->ft_chain,
+
&fld->lcf_targets);
fld->lcf_count++;
- spin_unlock(&fld->lcf_lock);
+
cfs_
spin_unlock(&fld->lcf_lock);
RETURN(0);
}
@@
-260,13
+260,13
@@
int fld_client_del_target(struct lu_client_fld *fld,
struct lu_fld_target *target, *tmp;
ENTRY;
- spin_lock(&fld->lcf_lock);
- list_for_each_entry_safe(target, tmp,
- &fld->lcf_targets, ft_chain) {
+
cfs_
spin_lock(&fld->lcf_lock);
+
cfs_
list_for_each_entry_safe(target, tmp,
+
&fld->lcf_targets, ft_chain) {
if (target->ft_idx == idx) {
fld->lcf_count--;
- list_del(&target->ft_chain);
- spin_unlock(&fld->lcf_lock);
+
cfs_
list_del(&target->ft_chain);
+
cfs_
spin_unlock(&fld->lcf_lock);
if (target->ft_exp != NULL)
class_export_put(target->ft_exp);
@@
-275,7
+275,7
@@
int fld_client_del_target(struct lu_client_fld *fld,
RETURN(0);
}
}
- spin_unlock(&fld->lcf_lock);
+
cfs_
spin_unlock(&fld->lcf_lock);
RETURN(-ENOENT);
}
EXPORT_SYMBOL(fld_client_del_target);
@@
-344,9
+344,7
@@
static inline int hash_is_sane(int hash)
int fld_client_init(struct lu_client_fld *fld,
const char *prefix, int hash)
{
-#ifdef __KERNEL__
int cache_size, cache_threshold;
-#endif
int rc;
ENTRY;
@@
-362,12
+360,11
@@
int fld_client_init(struct lu_client_fld *fld,
}
fld->lcf_count = 0;
- spin_lock_init(&fld->lcf_lock);
+
cfs_
spin_lock_init(&fld->lcf_lock);
fld->lcf_hash = &fld_hash[hash];
fld->lcf_flags = LUSTRE_FLD_INIT;
CFS_INIT_LIST_HEAD(&fld->lcf_targets);
-#ifdef __KERNEL__
cache_size = FLD_CLIENT_CACHE_SIZE /
sizeof(struct fld_cache_entry);
@@
-381,7
+378,6
@@
int fld_client_init(struct lu_client_fld *fld,
fld->lcf_cache = NULL;
GOTO(out, rc);
}
-#endif
rc = fld_client_proc_init(fld);
if (rc)
@@
-404,24
+400,22
@@
void fld_client_fini(struct lu_client_fld *fld)
fld_client_proc_fini(fld);
- spin_lock(&fld->lcf_lock);
- list_for_each_entry_safe(target, tmp,
- &fld->lcf_targets, ft_chain) {
+
cfs_
spin_lock(&fld->lcf_lock);
+
cfs_
list_for_each_entry_safe(target, tmp,
+
&fld->lcf_targets, ft_chain) {
fld->lcf_count--;
- list_del(&target->ft_chain);
+
cfs_
list_del(&target->ft_chain);
if (target->ft_exp != NULL)
class_export_put(target->ft_exp);
OBD_FREE_PTR(target);
}
- spin_unlock(&fld->lcf_lock);
+
cfs_
spin_unlock(&fld->lcf_lock);
-#ifdef __KERNEL__
if (fld->lcf_cache != NULL) {
if (!IS_ERR(fld->lcf_cache))
fld_cache_fini(fld->lcf_cache);
fld->lcf_cache = NULL;
}
-#endif
EXIT;
}
@@
-523,8
+517,6
@@
EXPORT_SYMBOL(fld_client_lookup);
void fld_client_flush(struct lu_client_fld *fld)
{
-#ifdef __KERNEL__
fld_cache_flush(fld->lcf_cache);
-#endif
}
EXPORT_SYMBOL(fld_client_flush);