* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_FID
+#include <linux/err.h>
#include <linux/module.h>
-#include <libcfs/libcfs.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
#include <lustre_mdc.h>
#include "fid_internal.h"
+struct dentry *seq_debugfs_dir;
+
static int seq_client_rpc(struct lu_client_seq *seq,
struct lu_seq_range *output, __u32 opc,
const char *opcname)
static int seq_client_alloc_meta(const struct lu_env *env,
struct lu_client_seq *seq)
{
- int rc;
- ENTRY;
+ int rc;
+ ENTRY;
- if (seq->lcs_srv) {
+ if (seq->lcs_srv) {
#ifdef HAVE_SEQ_SERVER
- LASSERT(env != NULL);
- rc = seq_server_alloc_meta(seq->lcs_srv, &seq->lcs_space, env);
+ LASSERT(env);
+ rc = seq_server_alloc_meta(seq->lcs_srv, &seq->lcs_space, env);
#else
rc = 0;
#endif
* (MDT0)yet */
rc = seq_client_rpc(seq, &seq->lcs_space,
SEQ_ALLOC_META, "meta");
+ if (rc == -EINPROGRESS || rc == -EAGAIN) {
+ wait_queue_head_t waitq;
+ struct l_wait_info lwi;
+
+ /* MDT0 is not ready, let's wait for 2
+ * seconds and retry. */
+ init_waitqueue_head(&waitq);
+ lwi = LWI_TIMEOUT(cfs_time_seconds(2), NULL,
+ NULL);
+ l_wait_event(waitq, 0, &lwi);
+ }
} while (rc == -EINPROGRESS || rc == -EAGAIN);
- }
+ }
- RETURN(rc);
+ RETURN(rc);
}
/* Allocate new sequence for client. */
if (lu_seq_range_is_exhausted(&seq->lcs_space)) {
rc = seq_client_alloc_meta(env, seq);
if (rc) {
- CERROR("%s: Can't allocate new meta-sequence,"
- "rc %d\n", seq->lcs_name, rc);
+ if (rc != -EINPROGRESS)
+ CERROR("%s: Can't allocate new meta-sequence,"
+ "rc = %d\n", seq->lcs_name, rc);
RETURN(rc);
} else {
CDEBUG(D_INFO, "%s: New range - "DRANGE"\n",
}
static int seq_fid_alloc_prep(struct lu_client_seq *seq,
- wait_queue_t *link)
+ wait_queue_entry_t *link)
{
if (seq->lcs_update) {
add_wait_queue(&seq->lcs_waitq, link);
int seq_client_get_seq(const struct lu_env *env,
struct lu_client_seq *seq, u64 *seqnr)
{
- wait_queue_t link;
+ wait_queue_entry_t link;
int rc;
LASSERT(seqnr != NULL);
int seq_client_alloc_fid(const struct lu_env *env,
struct lu_client_seq *seq, struct lu_fid *fid)
{
- wait_queue_t link;
+ wait_queue_entry_t link;
int rc;
ENTRY;
/* Re-take seq::lcs_mutex via seq_fid_alloc_fini(). */
seq_fid_alloc_fini(seq, rc ? 0 : seqnr, false);
if (rc) {
- CERROR("%s: Can't allocate new sequence: rc = %d\n",
- seq->lcs_name, rc);
+ if (rc != -EINPROGRESS)
+ CERROR("%s: Can't allocate new sequence: "
+ "rc = %d\n", seq->lcs_name, rc);
mutex_unlock(&seq->lcs_mutex);
RETURN(rc);
*/
void seq_client_flush(struct lu_client_seq *seq)
{
- wait_queue_t link;
+ wait_queue_entry_t link;
LASSERT(seq != NULL);
init_waitqueue_entry(&link, current);
}
EXPORT_SYMBOL(seq_client_flush);
-static void seq_client_proc_fini(struct lu_client_seq *seq)
+static void seq_client_debugfs_fini(struct lu_client_seq *seq)
{
-#ifdef CONFIG_PROC_FS
- ENTRY;
- if (seq->lcs_proc_dir) {
- if (!IS_ERR(seq->lcs_proc_dir))
- lprocfs_remove(&seq->lcs_proc_dir);
- seq->lcs_proc_dir = NULL;
- }
- EXIT;
-#endif /* CONFIG_PROC_FS */
+ if (!IS_ERR_OR_NULL(seq->lcs_debugfs_entry))
+ ldebugfs_remove(&seq->lcs_debugfs_entry);
}
-static int seq_client_proc_init(struct lu_client_seq *seq)
+static int seq_client_debugfs_init(struct lu_client_seq *seq)
{
-#ifdef CONFIG_PROC_FS
int rc;
- ENTRY;
- seq->lcs_proc_dir = lprocfs_register(seq->lcs_name, seq_type_proc_dir,
- NULL, NULL);
- if (IS_ERR(seq->lcs_proc_dir)) {
- CERROR("%s: LProcFS failed in seq-init\n",
- seq->lcs_name);
- rc = PTR_ERR(seq->lcs_proc_dir);
- RETURN(rc);
+ seq->lcs_debugfs_entry = ldebugfs_register(seq->lcs_name,
+ seq_debugfs_dir,
+ NULL, NULL);
+ if (IS_ERR_OR_NULL(seq->lcs_debugfs_entry)) {
+ CERROR("%s: LdebugFS failed in seq-init\n", seq->lcs_name);
+ rc = seq->lcs_debugfs_entry ? PTR_ERR(seq->lcs_debugfs_entry)
+ : -ENOMEM;
+ seq->lcs_debugfs_entry = NULL;
+ RETURN(rc);
}
- rc = lprocfs_add_vars(seq->lcs_proc_dir, seq_client_proc_list, seq);
- if (rc) {
- CERROR("%s: Can't init sequence manager "
- "proc, rc %d\n", seq->lcs_name, rc);
+ rc = ldebugfs_add_vars(seq->lcs_debugfs_entry,
+ seq_client_debugfs_list, seq);
+ if (rc) {
+ CERROR("%s: Can't init sequence manager debugfs, rc %d\n",
+ seq->lcs_name, rc);
GOTO(out_cleanup, rc);
}
RETURN(0);
out_cleanup:
- seq_client_proc_fini(seq);
+ seq_client_debugfs_fini(seq);
return rc;
+}
-#else /* !CONFIG_PROC_FS */
- return 0;
-#endif /* CONFIG_PROC_FS */
+void seq_client_fini(struct lu_client_seq *seq)
+{
+ ENTRY;
+
+ seq_client_debugfs_fini(seq);
+
+ if (seq->lcs_exp != NULL) {
+ class_export_put(seq->lcs_exp);
+ seq->lcs_exp = NULL;
+ }
+
+ seq->lcs_srv = NULL;
+ EXIT;
}
+EXPORT_SYMBOL(seq_client_fini);
int seq_client_init(struct lu_client_seq *seq,
struct obd_export *exp,
snprintf(seq->lcs_name, sizeof(seq->lcs_name),
"cli-%s", prefix);
- rc = seq_client_proc_init(seq);
+ rc = seq_client_debugfs_init(seq);
if (rc)
seq_client_fini(seq);
RETURN(rc);
}
EXPORT_SYMBOL(seq_client_init);
-void seq_client_fini(struct lu_client_seq *seq)
-{
- ENTRY;
-
- seq_client_proc_fini(seq);
-
- if (seq->lcs_exp != NULL) {
- class_export_put(seq->lcs_exp);
- seq->lcs_exp = NULL;
- }
-
- seq->lcs_srv = NULL;
- EXIT;
-}
-EXPORT_SYMBOL(seq_client_fini);
-
int client_fid_init(struct obd_device *obd,
struct obd_export *exp, enum lu_cli_type type)
{
int rc;
ENTRY;
+ down_write(&cli->cl_seq_rwsem);
OBD_ALLOC_PTR(cli->cl_seq);
- if (cli->cl_seq == NULL)
- RETURN(-ENOMEM);
+ if (!cli->cl_seq)
+ GOTO(out, rc = -ENOMEM);
OBD_ALLOC(prefix, MAX_OBD_NAME + 5);
- if (prefix == NULL)
- GOTO(out_free_seq, rc = -ENOMEM);
+ if (!prefix)
+ GOTO(out, rc = -ENOMEM);
snprintf(prefix, MAX_OBD_NAME + 5, "cli-%s", obd->obd_name);
/* Init client side sequence-manager */
rc = seq_client_init(cli->cl_seq, exp, type, prefix, NULL);
OBD_FREE(prefix, MAX_OBD_NAME + 5);
- if (rc)
- GOTO(out_free_seq, rc);
- RETURN(rc);
-out_free_seq:
- OBD_FREE_PTR(cli->cl_seq);
- cli->cl_seq = NULL;
+ GOTO(out, rc);
+
+out:
+ if (rc && cli->cl_seq) {
+ OBD_FREE_PTR(cli->cl_seq);
+ cli->cl_seq = NULL;
+ }
+ up_write(&cli->cl_seq_rwsem);
+
return rc;
}
EXPORT_SYMBOL(client_fid_init);
struct client_obd *cli = &obd->u.cli;
ENTRY;
- if (cli->cl_seq != NULL) {
+ down_write(&cli->cl_seq_rwsem);
+ if (cli->cl_seq) {
seq_client_fini(cli->cl_seq);
OBD_FREE_PTR(cli->cl_seq);
cli->cl_seq = NULL;
}
+ up_write(&cli->cl_seq_rwsem);
RETURN(0);
}
EXPORT_SYMBOL(client_fid_fini);
-struct proc_dir_entry *seq_type_proc_dir;
-
static int __init fid_init(void)
{
- seq_type_proc_dir = lprocfs_register(LUSTRE_SEQ_NAME,
- proc_lustre_root,
- NULL, NULL);
- if (IS_ERR(seq_type_proc_dir))
- return PTR_ERR(seq_type_proc_dir);
+#ifdef HAVE_SERVER_SUPPORT
+ int rc = fid_server_mod_init();
-# ifdef HAVE_SERVER_SUPPORT
- fid_server_mod_init();
-# endif
-
- return 0;
+ if (rc)
+ return rc;
+#endif
+ seq_debugfs_dir = ldebugfs_register(LUSTRE_SEQ_NAME,
+ debugfs_lustre_root,
+ NULL, NULL);
+ return PTR_ERR_OR_ZERO(seq_debugfs_dir);
}
static void __exit fid_exit(void)
# ifdef HAVE_SERVER_SUPPORT
fid_server_mod_exit();
# endif
-
- if (seq_type_proc_dir != NULL && !IS_ERR(seq_type_proc_dir)) {
- lprocfs_remove(&seq_type_proc_dir);
- seq_type_proc_dir = NULL;
- }
+ if (!IS_ERR_OR_NULL(seq_debugfs_dir))
+ ldebugfs_remove(&seq_debugfs_dir);
}
MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
git://git.whamcloud.com / fs / lustre-release.git / blobdiff