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

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>

diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c
index ce553406318dd713c07bbd91a03c9157c8971a2a..7c45e74790873d9861a84733e6f1d8eeee63816b 100644 (file)
--- a/drivers/staging/lustre/lustre/fid/fid_request.c
+++ b/drivers/staging/lustre/lustre/fid/fid_request.c
@@ -150,19 +150,15 @@ int seq_client_alloc_super(struct lu_client_seq *seq,
 
        mutex_lock(&seq->lcs_mutex);
 
-       if (seq->lcs_srv) {
-               rc = 0;
-       } else {
-               /* Check whether the connection to seq controller has been
-                * setup (lcs_exp != NULL) */
-               if (seq->lcs_exp == NULL) {
-                       mutex_unlock(&seq->lcs_mutex);
-                       return -EINPROGRESS;
-               }
-
-               rc = seq_client_rpc(seq, &seq->lcs_space,
-                                   SEQ_ALLOC_SUPER, "super");
+       /* Check whether the connection to seq controller has been
+        * setup (lcs_exp != NULL) */
+       if (!seq->lcs_exp) {
+               mutex_unlock(&seq->lcs_mutex);
+               return -EINPROGRESS;
        }
+
+       rc = seq_client_rpc(seq, &seq->lcs_space,
+                           SEQ_ALLOC_SUPER, "super");
        mutex_unlock(&seq->lcs_mutex);
        return rc;
 }
@@ -173,18 +169,14 @@ static int seq_client_alloc_meta(const struct lu_env *env,
 {
        int rc;
 
-       if (seq->lcs_srv) {
-               rc = 0;
-       } else {
-               do {
-                       /* If meta server return -EINPROGRESS or EAGAIN,
-                        * it means meta server might not be ready to
-                        * allocate super sequence from sequence controller
-                        * (MDT0)yet */
-                       rc = seq_client_rpc(seq, &seq->lcs_space,
-                                           SEQ_ALLOC_META, "meta");
-               } while (rc == -EINPROGRESS || rc == -EAGAIN);
-       }
+       do {
+               /* If meta server return -EINPROGRESS or EAGAIN,
+                * it means meta server might not be ready to
+                * allocate super sequence from sequence controller
+                * (MDT0)yet */
+               rc = seq_client_rpc(seq, &seq->lcs_space,
+                                   SEQ_ALLOC_META, "meta");
+       } while (rc == -EINPROGRESS || rc == -EAGAIN);
 
        return rc;
 }
@@ -395,8 +387,6 @@ static void seq_client_fini(struct lu_client_seq *seq)
                class_export_put(seq->lcs_exp);
                seq->lcs_exp = NULL;
        }
-
-       seq->lcs_srv = NULL;
 }
 
 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(prefix != NULL);
 
-       seq->lcs_srv = NULL;
        seq->lcs_type = type;
 
        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. */
        seq_client_flush(seq);
 
-       if (exp != NULL)
-               seq->lcs_exp = class_export_get(exp);
-       else if (type == LUSTRE_SEQ_METADATA)
-               LASSERT(seq->lcs_srv != NULL);
+       seq->lcs_exp = class_export_get(exp);
 
        snprintf(seq->lcs_name, sizeof(seq->lcs_name),
                 "cli-%s", prefix);

diff --git a/drivers/staging/lustre/lustre/fid/lproc_fid.c b/drivers/staging/lustre/lustre/fid/lproc_fid.c
index bf12723c9b1cbf81e6b32c362d106907b9e65c31..ce90c1c54a637b4964578d9c807dd144ef956934 100644 (file)
--- a/drivers/staging/lustre/lustre/fid/lproc_fid.c
+++ b/drivers/staging/lustre/lustre/fid/lproc_fid.c
@@ -204,8 +204,6 @@ ldebugfs_fid_server_seq_show(struct seq_file *m, void *unused)
        if (seq->lcs_exp != NULL) {
                cli = &seq->lcs_exp->exp_obd->u.cli;
                seq_printf(m, "%s\n", cli->cl_target_uuid.uuid);
-       } else {
-               seq_printf(m, "%s\n", seq->lcs_srv->lss_name);
        }
 
        return 0;

diff --git a/drivers/staging/lustre/lustre/include/lustre_fid.h b/drivers/staging/lustre/lustre/include/lustre_fid.h
index 22fc96ef25b49bc50ab4a19afb3bf05e61057a15..bbe3ff8d63fe133d27a7bd0d30b8bbf4d10c6044 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_fid.h
+++ b/drivers/staging/lustre/lustre/include/lustre_fid.h
@@ -330,8 +330,6 @@ enum lu_mgr_type {
        LUSTRE_SEQ_CONTROLLER
 };
 
-struct lu_server_seq;
-
 /* Client sequence manager interface. */
 struct lu_client_seq {
        /* Sequence-controller export. */
@@ -366,9 +364,6 @@ struct lu_client_seq {
         */
        __u64              lcs_width;
 
-       /* Seq-server for direct talking */
-       struct lu_server_seq   *lcs_srv;
-
        /* wait queue for fid allocation and update indicator */
        wait_queue_head_t            lcs_waitq;
        int                  lcs_update;