leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging/lustre/fid: Get rid of lcs_srv in lu_client_seq

Browse Source 
Since we know lcs_srv is always NULL, just get rid of it completely
and fix up all the code to assumee it was never there.

Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oleg Drokin 2015-09-28 23:44:06 -04:00 committed by Greg Kroah-Hartman
parent 997f0eed26
commit f4f8407fb1
3 changed files with 17 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/lustre/lustre/fid/fid_request.c
View File

@ -150,19 +150,15 @@ int seq_client_alloc_super(struct lu_client_seq *seq,
mutex_lock(&seq->lcs_mutex); mutex_lock(&seq->lcs_mutex);
if (seq->lcs_srv) {
rc = 0;
} else {
/* Check whether the connection to seq controller has been /* Check whether the connection to seq controller has been
* setup (lcs_exp != NULL) */ * setup (lcs_exp != NULL) */
if (seq->lcs_exp == NULL) { if (!seq->lcs_exp) {
mutex_unlock(&seq->lcs_mutex); mutex_unlock(&seq->lcs_mutex);
return -EINPROGRESS; return -EINPROGRESS;
} }
rc = seq_client_rpc(seq, &seq->lcs_space, rc = seq_client_rpc(seq, &seq->lcs_space,
SEQ_ALLOC_SUPER, "super"); SEQ_ALLOC_SUPER, "super");
}
mutex_unlock(&seq->lcs_mutex); mutex_unlock(&seq->lcs_mutex);
return rc; return rc;
} }
@ -173,9 +169,6 @@ static int seq_client_alloc_meta(const struct lu_env *env,
{ {
int rc; int rc;
if (seq->lcs_srv) {
rc = 0;
} else {
do { do {
/* If meta server return -EINPROGRESS or EAGAIN, /* If meta server return -EINPROGRESS or EAGAIN,
* it means meta server might not be ready to * it means meta server might not be ready to
@ -184,7 +177,6 @@ static int seq_client_alloc_meta(const struct lu_env *env,
rc = seq_client_rpc(seq, &seq->lcs_space, rc = seq_client_rpc(seq, &seq->lcs_space,
SEQ_ALLOC_META, "meta"); SEQ_ALLOC_META, "meta");
} while (rc == -EINPROGRESS || rc == -EAGAIN); } while (rc == -EINPROGRESS || rc == -EAGAIN);
}
return rc; return rc;
} }
@ -395,8 +387,6 @@ static void seq_client_fini(struct lu_client_seq *seq)
class_export_put(seq->lcs_exp); class_export_put(seq->lcs_exp);
seq->lcs_exp = NULL; seq->lcs_exp = NULL;
} }
seq->lcs_srv = NULL;
} }
static int seq_client_init(struct lu_client_seq *seq, static int seq_client_init(struct lu_client_seq *seq,
@ -409,7 +399,6 @@ static int seq_client_init(struct lu_client_seq *seq,
LASSERT(seq != NULL); LASSERT(seq != NULL);
LASSERT(prefix != NULL); LASSERT(prefix != NULL);
seq->lcs_srv = NULL;
seq->lcs_type = type; seq->lcs_type = type;
mutex_init(&seq->lcs_mutex); mutex_init(&seq->lcs_mutex);
@ -422,10 +411,7 @@ static int seq_client_init(struct lu_client_seq *seq,
/* Make sure that things are clear before work is started. */ /* Make sure that things are clear before work is started. */
seq_client_flush(seq); seq_client_flush(seq);
if (exp != NULL)
seq->lcs_exp = class_export_get(exp); seq->lcs_exp = class_export_get(exp);
else if (type == LUSTRE_SEQ_METADATA)
LASSERT(seq->lcs_srv != NULL);
snprintf(seq->lcs_name, sizeof(seq->lcs_name), snprintf(seq->lcs_name, sizeof(seq->lcs_name),
"cli-%s", prefix); "cli-%s", prefix);

2
drivers/staging/lustre/lustre/fid/lproc_fid.c
View File

@ -204,8 +204,6 @@ ldebugfs_fid_server_seq_show(struct seq_file *m, void *unused)
if (seq->lcs_exp != NULL) { if (seq->lcs_exp != NULL) {
cli = &seq->lcs_exp->exp_obd->u.cli; cli = &seq->lcs_exp->exp_obd->u.cli;
seq_printf(m, "%s\n", cli->cl_target_uuid.uuid); seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
} else {
seq_printf(m, "%s\n", seq->lcs_srv->lss_name);
} }
return 0; return 0;

5
drivers/staging/lustre/lustre/include/lustre_fid.h
View File

@ -330,8 +330,6 @@ enum lu_mgr_type {
LUSTRE_SEQ_CONTROLLER LUSTRE_SEQ_CONTROLLER
}; };
struct lu_server_seq;
/* Client sequence manager interface. */ /* Client sequence manager interface. */
struct lu_client_seq { struct lu_client_seq {
/* Sequence-controller export. */ /* Sequence-controller export. */
@ -366,9 +364,6 @@ struct lu_client_seq {
*/ */
__u64 lcs_width; __u64 lcs_width;
/* Seq-server for direct talking */
struct lu_server_seq *lcs_srv;
/* wait queue for fid allocation and update indicator */ /* wait queue for fid allocation and update indicator */
wait_queue_head_t lcs_waitq; wait_queue_head_t lcs_waitq;
int lcs_update; int lcs_update;