/**
* Extract index information from fld name like srv-fsname-MDT0000
**/
-int fld_name_to_index(const char *name, __u32 *index)
+int fld_name_to_index(const char *name, u32 *index)
{
char *dash;
int rc;
+
ENTRY;
CDEBUG(D_INFO, "get index from %s\n", name);
dash = strrchr(name, '-');
- if (dash == NULL)
+ if (!dash)
RETURN(-EINVAL);
dash++;
rc = target_name2index(dash, index, NULL);
int fld_update_from_controller(const struct lu_env *env,
struct lu_server_fld *fld)
{
- struct fld_thread_info *info;
- struct lu_seq_range *range;
+ struct fld_thread_info *info;
+ struct lu_seq_range *range;
struct lu_seq_range_array *lsra;
- __u32 index;
- struct ptlrpc_request *req;
- int rc;
- int i;
+ u32 index;
+ struct ptlrpc_request *req;
+ int rc;
+ int i;
+
ENTRY;
- /* Update only happens during initalization, i.e. local FLDB
- * does not exist yet */
+ /*
+ * Update only happens during initalization, i.e. local FLDB
+ * does not exist yet
+ */
if (!fld->lsf_new)
RETURN(0);
LASSERT(req != NULL);
lsra = (struct lu_seq_range_array *)req_capsule_server_get(
&req->rq_pill, &RMF_GENERIC_DATA);
- if (lsra == NULL)
+ if (!lsra)
GOTO(out, rc = -EPROTO);
range_array_le_to_cpu(lsra, lsra);
fld->lsf_new = 1;
out:
- if (req != NULL)
+ if (req)
ptlrpc_req_finished(req);
RETURN(rc);
struct lu_seq_range *erange;
struct fld_thread_info *info;
int rc;
+
ENTRY;
info = lu_context_key_get(&env->le_ctx, &fld_thread_key);
if (rc == 0) {
if (unlikely(fld_range_type(erange) != fld_range_type(range) &&
!fld_range_is_any(range))) {
- CERROR("%s: FLD cache range "DRANGE" does not match"
- "requested flag %x: rc = %d\n", fld->lsf_name,
- PRANGE(erange), range->lsr_flags, -EIO);
+ CERROR("%s: FLD cache range "DRANGE" does not match requested flag %x: rc = %d\n",
+ fld->lsf_name, PRANGE(erange), range->lsr_flags,
+ -EIO);
RETURN(-EIO);
}
*range = *erange;
int fld_server_lookup(const struct lu_env *env, struct lu_server_fld *fld,
u64 seq, struct lu_seq_range *range)
{
- __u32 index;
+ u32 index;
int rc;
+
ENTRY;
rc = fld_local_lookup(env, fld, seq, range);
RETURN(rc);
if (index == 0 && rc == LDD_F_SV_TYPE_MDT) {
- /* On server side, all entries should be in cache.
- * If we can not find it in cache, just return error */
+ /*
+ * On server side, all entries should be in cache.
+ * If we can not find it in cache, just return error
+ */
CERROR("%s: Cannot find sequence %#llx: rc = %d\n",
fld->lsf_name, seq, -ENOENT);
RETURN(-ENOENT);
} else {
- if (fld->lsf_control_exp == NULL) {
- CERROR("%s: lookup %#llx, but not connects to MDT0"
- "yet: rc = %d.\n", fld->lsf_name, seq, -EIO);
+ if (!fld->lsf_control_exp) {
+ CERROR("%s: lookup %#llx, but not connects to MDT0 yet: rc = %d.\n",
+ fld->lsf_name, seq, -EIO);
RETURN(-EIO);
}
- /* send request to mdt0 i.e. super seq. controller.
+ /*
+ * send request to mdt0 i.e. super seq. controller.
* This is temporary solution, long term solution is fld
* replication on all mdt servers.
*/
*/
static int fld_handle_lookup(struct tgt_session_info *tsi)
{
- struct obd_export *exp = tsi->tsi_exp;
- struct lu_site *site = exp->exp_obd->obd_lu_dev->ld_site;
- struct lu_server_fld *fld;
- struct lu_seq_range *in;
- struct lu_seq_range *out;
- int rc;
+ struct obd_export *exp = tsi->tsi_exp;
+ struct lu_site *site = exp->exp_obd->obd_lu_dev->ld_site;
+ struct lu_server_fld *fld;
+ struct lu_seq_range *in;
+ struct lu_seq_range *out;
+ int rc;
ENTRY;
in = req_capsule_client_get(tsi->tsi_pill, &RMF_FLD_MDFLD);
- if (in == NULL)
+ if (!in)
RETURN(err_serious(-EPROTO));
rc = req_capsule_server_pack(tsi->tsi_pill);
RETURN(err_serious(rc));
out = req_capsule_server_get(tsi->tsi_pill, &RMF_FLD_MDFLD);
- if (out == NULL)
+ if (!out)
RETURN(err_serious(-EPROTO));
*out = *in;
static int fld_handle_read(struct tgt_session_info *tsi)
{
- struct obd_export *exp = tsi->tsi_exp;
- struct lu_site *site = exp->exp_obd->obd_lu_dev->ld_site;
- struct lu_seq_range *in;
- void *data;
- int rc;
+ struct obd_export *exp = tsi->tsi_exp;
+ struct lu_site *site = exp->exp_obd->obd_lu_dev->ld_site;
+ struct lu_seq_range *in;
+ void *data;
+ int rc;
ENTRY;
req_capsule_set(tsi->tsi_pill, &RQF_FLD_READ);
in = req_capsule_client_get(tsi->tsi_pill, &RMF_FLD_MDFLD);
- if (in == NULL)
+ if (!in)
RETURN(err_serious(-EPROTO));
req_capsule_set_size(tsi->tsi_pill, &RMF_GENERIC_DATA, RCL_SERVER,
* fid_is_local() is supposed to be used in assertion checks only.
*/
int fid_is_local(const struct lu_env *env,
- struct lu_site *site, const struct lu_fid *fid)
+ struct lu_site *site, const struct lu_fid *fid)
{
int result;
struct seq_server_site *ss_site;
struct lu_seq_range *range;
struct fld_thread_info *info;
+
ENTRY;
info = lu_context_key_get(&env->le_ctx, &fld_thread_key);
result = 1; /* conservatively assume fid is local */
ss_site = lu_site2seq(site);
- if (ss_site->ss_client_fld != NULL) {
+ if (ss_site->ss_client_fld) {
int rc;
rc = fld_cache_lookup(ss_site->ss_client_fld->lcf_cache,
return result;
}
-static void fld_server_proc_fini(struct lu_server_fld *fld);
+static void fld_server_debugfs_fini(struct lu_server_fld *fld)
+{
+ if (!IS_ERR_OR_NULL(fld->lsf_debugfs_entry))
+ ldebugfs_remove(&fld->lsf_debugfs_entry);
+}
-#ifdef CONFIG_PROC_FS
-static int fld_server_proc_init(struct lu_server_fld *fld)
+static int fld_server_debugfs_init(struct lu_server_fld *fld)
{
- int rc = 0;
- ENTRY;
+ int rc = 0;
- fld->lsf_proc_dir = lprocfs_register(fld->lsf_name, fld_type_proc_dir,
- fld_server_proc_list, fld);
- if (IS_ERR(fld->lsf_proc_dir)) {
- rc = PTR_ERR(fld->lsf_proc_dir);
+ ENTRY;
+ fld->lsf_debugfs_entry = ldebugfs_register(fld->lsf_name,
+ fld_debugfs_dir,
+ NULL, NULL);
+ if (IS_ERR_OR_NULL(fld->lsf_debugfs_entry)) {
+ rc = fld->lsf_debugfs_entry ? PTR_ERR(fld->lsf_debugfs_entry)
+ : -ENOMEM;
+ fld->lsf_debugfs_entry = NULL;
RETURN(rc);
}
- rc = lprocfs_seq_create(fld->lsf_proc_dir, "fldb", 0444,
- &fld_proc_seq_fops, fld);
- if (rc) {
- lprocfs_remove(&fld->lsf_proc_dir);
- fld->lsf_proc_dir = NULL;
- }
+ rc = ldebugfs_seq_create(fld->lsf_debugfs_entry, "fldb", 0444,
+ &fld_debugfs_seq_fops, fld);
+ if (rc)
+ ldebugfs_remove(&fld->lsf_debugfs_entry);
RETURN(rc);
}
-static void fld_server_proc_fini(struct lu_server_fld *fld)
-{
- ENTRY;
- if (fld->lsf_proc_dir != NULL) {
- if (!IS_ERR(fld->lsf_proc_dir))
- lprocfs_remove(&fld->lsf_proc_dir);
- fld->lsf_proc_dir = NULL;
- }
- EXIT;
-}
-#else
-static int fld_server_proc_init(struct lu_server_fld *fld)
-{
- return 0;
-}
-
-static void fld_server_proc_fini(struct lu_server_fld *fld)
-{
- return;
-}
-#endif
-
int fld_server_init(const struct lu_env *env, struct lu_server_fld *fld,
struct dt_device *dt, const char *prefix, int type)
{
if (rc)
GOTO(out_cache, rc);
- rc = fld_server_proc_init(fld);
+ rc = fld_server_debugfs_init(fld);
if (rc)
GOTO(out_index, rc);
{
ENTRY;
- fld_server_proc_fini(fld);
+ fld_server_debugfs_fini(fld);
fld_index_fini(env, fld);
- if (fld->lsf_cache != NULL) {
+ if (fld->lsf_cache) {
if (!IS_ERR(fld->lsf_cache))
fld_cache_fini(fld->lsf_cache);
fld->lsf_cache = NULL;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff