-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Author: Yury Umanets <umka@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_FLD
#ifdef __KERNEL__
int rc;
ENTRY;
client_obd_list_lock(&cli->cl_loi_list_lock);
- rc = list_empty(&mcw->mcw_entry);
+ rc = cfs_list_empty(&mcw->mcw_entry);
client_obd_list_unlock(&cli->cl_loi_list_lock);
RETURN(rc);
};
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);
client_obd_list_unlock(&cli->cl_loi_list_lock);
l_wait_event(mcw.mcw_waitq, fld_req_avail(cli, &mcw), &lwi);
static void fld_exit_request(struct client_obd *cli)
{
- struct list_head *l, *tmp;
+ cfs_list_t *l, *tmp;
struct mdc_cache_waiter *mcw;
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);
}
int hash;
ENTRY;
- hash = fld_rrb_hash(fld, seq);
-
- list_for_each_entry(target, &fld->lcf_targets, ft_chain) {
+ /* Because almost all of special sequence located in MDT0,
+ * it should go to index 0 directly, instead of calculating
+ * hash again, and also if other MDTs is not being connected,
+ * the fld lookup requests(for seq on MDT0) should not be
+ * blocked because of other MDTs */
+ if (fid_seq_is_norm(seq))
+ hash = fld_rrb_hash(fld, seq);
+ else
+ hash = 0;
+
+ cfs_list_for_each_entry(target, &fld->lcf_targets, ft_chain) {
if (target->ft_idx == hash)
RETURN(target);
}
"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 ?
};
static struct lu_fld_target *
-fld_client_get_target(struct lu_client_fld *fld,
- seqno_t seq)
+fld_client_get_target(struct lu_client_fld *fld, seqno_t seq)
{
- struct lu_fld_target *target;
- ENTRY;
+ struct lu_fld_target *target;
+ ENTRY;
- LASSERT(fld->lcf_hash != NULL);
+ LASSERT(fld->lcf_hash != NULL);
- spin_lock(&fld->lcf_lock);
- target = fld->lcf_hash->fh_scan_func(fld, seq);
- spin_unlock(&fld->lcf_lock);
+ spin_lock(&fld->lcf_lock);
+ target = fld->lcf_hash->fh_scan_func(fld, seq);
+ spin_unlock(&fld->lcf_lock);
if (target != NULL) {
CDEBUG(D_INFO, "%s: Found target (idx "LPU64
int fld_client_add_target(struct lu_client_fld *fld,
struct lu_fld_target *tar)
{
- const char *name = fld_target_name(tar);
+ const char *name;
struct lu_fld_target *target, *tmp;
ENTRY;
LASSERT(tar != NULL);
+ name = fld_target_name(tar);
LASSERT(name != NULL);
LASSERT(tar->ft_srv != NULL || tar->ft_exp != NULL);
if (target == NULL)
RETURN(-ENOMEM);
- spin_lock(&fld->lcf_lock);
- list_for_each_entry(tmp, &fld->lcf_targets, ft_chain) {
- if (tmp->ft_idx == tar->ft_idx) {
- spin_unlock(&fld->lcf_lock);
+ 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);
OBD_FREE_PTR(target);
CERROR("Target %s exists in FLD and known as %s:#"LPU64"\n",
name, fld_target_name(tmp), tmp->ft_idx);
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);
+ spin_unlock(&fld->lcf_lock);
- RETURN(0);
+ RETURN(0);
}
EXPORT_SYMBOL(fld_client_add_target);
/* Remove export from FLD */
-int fld_client_del_target(struct lu_client_fld *fld,
- __u64 idx)
+int fld_client_del_target(struct lu_client_fld *fld, __u64 idx)
{
- struct lu_fld_target *target, *tmp;
- ENTRY;
+ struct lu_fld_target *target, *tmp;
+ ENTRY;
- spin_lock(&fld->lcf_lock);
- 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);
+ 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--;
+ cfs_list_del(&target->ft_chain);
+ spin_unlock(&fld->lcf_lock);
if (target->ft_exp != NULL)
class_export_put(target->ft_exp);
RETURN(0);
}
}
- spin_unlock(&fld->lcf_lock);
- RETURN(-ENOENT);
+ spin_unlock(&fld->lcf_lock);
+ RETURN(-ENOENT);
}
EXPORT_SYMBOL(fld_client_del_target);
-static void fld_client_proc_fini(struct lu_client_fld *fld);
-
#ifdef LPROCFS
static int fld_client_proc_init(struct lu_client_fld *fld)
{
return rc;
}
-static void fld_client_proc_fini(struct lu_client_fld *fld)
+void fld_client_proc_fini(struct lu_client_fld *fld)
{
ENTRY;
if (fld->lcf_proc_dir) {
return 0;
}
-static void fld_client_proc_fini(struct lu_client_fld *fld)
+void fld_client_proc_fini(struct lu_client_fld *fld)
{
return;
}
#endif
+EXPORT_SYMBOL(fld_client_proc_fini);
+
static inline int hash_is_sane(int hash)
{
return (hash >= 0 && hash < ARRAY_SIZE(fld_hash));
}
fld->lcf_count = 0;
- spin_lock_init(&fld->lcf_lock);
+ 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);
void fld_client_fini(struct lu_client_fld *fld)
{
- struct lu_fld_target *target, *tmp;
- ENTRY;
+ struct lu_fld_target *target, *tmp;
+ ENTRY;
- fld_client_proc_fini(fld);
-
- spin_lock(&fld->lcf_lock);
- list_for_each_entry_safe(target, tmp,
- &fld->lcf_targets, ft_chain) {
+ 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);
+ spin_unlock(&fld->lcf_lock);
if (fld->lcf_cache != NULL) {
if (!IS_ERR(fld->lcf_cache))
int fld_client_rpc(struct obd_export *exp,
struct lu_seq_range *range, __u32 fld_op)
{
- struct ptlrpc_request *req;
- struct lu_seq_range *prange;
- __u32 *op;
- int rc;
- ENTRY;
-
- LASSERT(exp != NULL);
-
- req = ptlrpc_request_alloc_pack(class_exp2cliimp(exp), &RQF_FLD_QUERY,
- LUSTRE_MDS_VERSION, FLD_QUERY);
+ struct ptlrpc_request *req;
+ struct lu_seq_range *prange;
+ __u32 *op;
+ int rc;
+ struct obd_import *imp;
+ ENTRY;
+
+ LASSERT(exp != NULL);
+
+ imp = class_exp2cliimp(exp);
+ req = ptlrpc_request_alloc_pack(imp, &RQF_FLD_QUERY, LUSTRE_MDS_VERSION,
+ FLD_QUERY);
if (req == NULL)
RETURN(-ENOMEM);
req->rq_request_portal = FLD_REQUEST_PORTAL;
ptlrpc_at_set_req_timeout(req);
+ if (fld_op == FLD_LOOKUP &&
+ imp->imp_connect_flags_orig & OBD_CONNECT_MDS_MDS)
+ req->rq_allow_replay = 1;
+
if (fld_op != FLD_LOOKUP)
mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
fld_enter_request(&exp->exp_obd->u.cli);
return rc;
}
-int fld_client_lookup(struct lu_client_fld *fld,
- seqno_t seq, mdsno_t *mds,
- const struct lu_env *env)
+int fld_client_lookup(struct lu_client_fld *fld, seqno_t seq, mdsno_t *mds,
+ __u32 flags, const struct lu_env *env)
{
- struct lu_seq_range res;
- struct lu_fld_target *target;
- int rc;
- ENTRY;
+ struct lu_seq_range res = { 0 };
+ struct lu_fld_target *target;
+ int rc;
+ ENTRY;
fld->lcf_flags |= LUSTRE_FLD_RUN;
rc = fld_cache_lookup(fld->lcf_cache, seq, &res);
if (rc == 0) {
- *mds = res.lsr_mdt;
+ *mds = res.lsr_index;
RETURN(0);
}
"target %s (idx "LPU64")\n", fld->lcf_name, seq,
fld_target_name(target), target->ft_idx);
- res.lsr_start = seq;
+ res.lsr_start = seq;
+ fld_range_set_type(&res, flags);
#ifdef __KERNEL__
- if (target->ft_srv != NULL) {
- LASSERT(env != NULL);
- rc = fld_server_lookup(target->ft_srv,
- env, seq, &res);
- } else {
+ if (target->ft_srv != NULL) {
+ LASSERT(env != NULL);
+ rc = fld_server_lookup(env, target->ft_srv, seq, &res);
+ } else {
#endif
- rc = fld_client_rpc(target->ft_exp,
- &res, FLD_LOOKUP);
+ rc = fld_client_rpc(target->ft_exp, &res, FLD_LOOKUP);
#ifdef __KERNEL__
- }
+ }
#endif
- if (rc == 0) {
- *mds = res.lsr_mdt;
+ if (rc == 0) {
+ *mds = res.lsr_index;
- fld_cache_insert(fld->lcf_cache, &res);
- }
- RETURN(rc);
+ fld_cache_insert(fld->lcf_cache, &res);
+ }
+ RETURN(rc);
}
EXPORT_SYMBOL(fld_client_lookup);