- made fld and seq-mgr a bit less noisy.

diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c
index 7646da6..7c1e89d 100644 (file)
--- a/lustre/fid/fid_handler.c
+++ b/lustre/fid/fid_handler.c
@@ -182,7 +182,7 @@ __seq_server_alloc_super(struct lu_server_seq *seq,
         }
 
         if (rc == 0) {
-                CDEBUG(D_INFO|D_WARNING, "SEQ-MGR(srv): allocated super-sequence "
+                CDEBUG(D_INFO, "SEQ-MGR(srv): allocated super-sequence "
                        "["LPX64"-"LPX64"]\n", range->lr_start, range->lr_end);
         }
         
@@ -256,7 +256,7 @@ __seq_server_alloc_meta(struct lu_server_seq *seq,
         }
 
         if (rc == 0) {
-                CDEBUG(D_INFO|D_WARNING, "SEQ-MGR(srv): allocated meta-sequence "
+                CDEBUG(D_INFO, "SEQ-MGR(srv): allocated meta-sequence "
                        "["LPX64"-"LPX64"]\n", range->lr_start, range->lr_end);
         }
 

diff --git a/lustre/fid/fid_request.c b/lustre/fid/fid_request.c
index 2970c78..c3f4c57 100644 (file)
--- a/lustre/fid/fid_request.c
+++ b/lustre/fid/fid_request.c
@@ -105,7 +105,7 @@ __seq_client_alloc_super(struct lu_client_seq *seq)
 
         rc = seq_client_rpc(seq, &seq->seq_range, SEQ_ALLOC_SUPER);
         if (rc == 0) {
-                CDEBUG(D_INFO|D_WARNING, "SEQ-MGR(cli): allocated super-sequence "
+                CDEBUG(D_INFO, "SEQ-MGR(cli): allocated super-sequence "
                        "["LPX64"-"LPX64"]\n", seq->seq_range.lr_start,
                        seq->seq_range.lr_end);
         }
@@ -135,7 +135,7 @@ __seq_client_alloc_meta(struct lu_client_seq *seq)
 
         rc = seq_client_rpc(seq, &seq->seq_range, SEQ_ALLOC_META);
         if (rc == 0) {
-                CDEBUG(D_INFO|D_WARNING, "SEQ-MGR(cli): allocated meta-sequence "
+                CDEBUG(D_INFO, "SEQ-MGR(cli): allocated meta-sequence "
                        "["LPX64"-"LPX64"]\n", seq->seq_range.lr_start,
                        seq->seq_range.lr_end);
         }
@@ -179,7 +179,7 @@ __seq_client_alloc_seq(struct lu_client_seq *seq, __u64 *seqnr)
         seq->seq_range.lr_start += 1;
         
         if (rc == 0) {
-                CDEBUG(D_INFO|D_WARNING, "SEQ-MGR(cli): allocated "
+                CDEBUG(D_INFO, "SEQ-MGR(cli): allocated "
                        "sequence ["LPX64"]\n", *seqnr);
         }
         RETURN(rc);
@@ -297,7 +297,7 @@ seq_client_init(struct lu_client_seq *seq,
                 const char *uuid,
                 struct obd_export *exp)
 {
-        int rc;
+        int rc = 0;
         ENTRY;
 
         LASSERT(exp != NULL);
@@ -313,18 +313,14 @@ seq_client_init(struct lu_client_seq *seq,
 
 #ifdef LPROCFS
         rc = seq_client_proc_init(seq);
-        if (rc)
-                GOTO(out, rc);
 #endif
 
-        EXIT;
-out:
         if (rc)
                 seq_client_fini(seq);
         else
                 CDEBUG(D_INFO|D_WARNING,
                        "Client Sequence Manager\n");
-        return rc;
+        RETURN(rc);
 }
 EXPORT_SYMBOL(seq_client_init);
 

diff --git a/lustre/fld/fld_internal.h b/lustre/fld/fld_internal.h
index 181027f..0c4d628 100644 (file)
--- a/lustre/fld/fld_internal.h
+++ b/lustre/fld/fld_internal.h
@@ -33,7 +33,7 @@ typedef __u64 fidseq_t;
 struct fld_cache_entry {
         struct hlist_node  fce_list;
         mdsno_t            fce_mds;
-        __u64              fce_seq;
+        fidseq_t           fce_seq;
 };
 
 struct fld_cache_info {

diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c
index a93e16b..20520f7 100644 (file)
--- a/lustre/fld/fld_request.c
+++ b/lustre/fld/fld_request.c
@@ -206,13 +206,14 @@ int
 fld_client_add_export(struct lu_client_fld *fld,
                       struct obd_export *exp)
 {
+        struct client_obd *cli = &exp->exp_obd->u.cli;
         struct obd_export *fld_exp;
         ENTRY;
 
         LASSERT(exp != NULL);
 
         CDEBUG(D_INFO|D_WARNING, "FLD(cli): adding export %s\n",
-              exp->exp_client_uuid.uuid);
+              cli->cl_target_uuid.uuid);
         
         spin_lock(&fld->fld_lock);
         list_for_each_entry(fld_exp, &fld->fld_exports, exp_fld_chain) {
@@ -507,8 +508,7 @@ fld_client_lookup(struct lu_client_fld *fld,
                 RETURN(rc);
 
 #ifdef __KERNEL__
-        if (rc == 0)
-                rc = fld_cache_insert(fld_cache, seq, *mds);
+        rc = fld_cache_insert(fld_cache, seq, *mds);
 #endif
         
         RETURN(rc);

diff --git a/lustre/lmv/lmv_fld.c b/lustre/lmv/lmv_fld.c
index 8465152..29ec8d6 100644 (file)
--- a/lustre/lmv/lmv_fld.c
+++ b/lustre/lmv/lmv_fld.c
@@ -59,7 +59,7 @@ int lmv_fld_lookup(struct obd_device *obd, const struct lu_fid *fid)
                        fid_seq(fid), rc);
                 RETURN(rc);
         }
-        CDEBUG(D_TRACE, "LMV: got MDS "LPU64" for sequence: "LPU64"\n",
+        CDEBUG(D_INFO, "LMV: got MDS "LPU64" for sequence: "LPU64"\n",
                mds, fid_seq(fid));
         if (mds >= lmv->desc.ld_tgt_count) {
                 CERROR("Got invalid mdsno: "LPU64" (max: %d)\n",