- changes in error messages of seq and fld.

diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c
index 58c6724..5d9046f 100644 (file)
--- a/lustre/fid/fid_handler.c
+++ b/lustre/fid/fid_handler.c
@@ -57,20 +57,20 @@ int seq_server_set_cli(struct lu_server_seq *seq,
         ENTRY;
 
         if (cli == NULL) {
-                CDEBUG(D_INFO|D_WARNING, "%s: detached "
-                       "sequence mgr client %s\n",
-                       seq->lss_name, cli->lcs_name);
+                CDEBUG(D_INFO|D_WARNING, "%s: Detached "
+                       "sequence client %s\n", seq->lss_name, 
+                       cli->lcs_name);
                 seq->lss_cli = cli;
                 RETURN(0);
         }
 
         if (seq->lss_cli) {
-                CERROR("%s: sequence-controller is already "
+                CERROR("%s: Sequence-controller is already "
                        "assigned\n", seq->lss_name);
                 RETURN(-EINVAL);
         }
 
-        CDEBUG(D_INFO|D_WARNING, "%s: attached "
+        CDEBUG(D_INFO|D_WARNING, "%s: Attached "
                "sequence client %s\n", seq->lss_name,
                cli->lcs_name);
 
@@ -87,8 +87,8 @@ int seq_server_set_cli(struct lu_server_seq *seq,
                 rc = seq_client_alloc_super(cli, ctx);
                 if (rc) {
                         up(&seq->lss_sem);
-                        CERROR("Can't allocate super-sequence, "
-                               "rc %d\n", rc);
+                        CERROR("%s: Can't allocate super-sequence, "
+                               "rc %d\n", seq->lss_name, rc);
                         RETURN(rc);
                 }
 
@@ -100,8 +100,8 @@ int seq_server_set_cli(struct lu_server_seq *seq,
                 /* save init seq to backing store. */
                 rc = seq_store_write(seq, ctx);
                 if (rc) {
-                        CERROR("Can't write sequence state, "
-                               "rc = %d\n", rc);
+                        CERROR("%s: Can't write sequence state, "
+                               "rc = %d\n", seq->lss_name, rc);
                 }
         }
 
@@ -124,7 +124,7 @@ static int __seq_server_alloc_super(struct lu_server_seq *seq,
         LASSERT(range_is_sane(space));
 
         if (in != NULL) {
-                CDEBUG(D_INFO, "%s: recovery - use input range "
+                CDEBUG(D_INFO, "%s: Recovery - use input range "
                        DRANGE"\n", seq->lss_name, PRANGE(in));
 
                 if (in->lr_start > space->lr_start)
@@ -132,13 +132,14 @@ static int __seq_server_alloc_super(struct lu_server_seq *seq,
                 *out = *in;
         } else {
                 if (range_space(space) < seq->lss_super_width) {
-                        CWARN("Sequences space is going to exhaust soon. "
-                              "Can allocate only "LPU64" sequences\n",
+                        CWARN("%s: Sequences space to be exhausted soon. "
+                              "Only "LPU64" sequences left\n", seq->lss_name, 
                               range_space(space));
                         *out = *space;
                         space->lr_start = space->lr_end;
                 } else if (range_is_exhausted(space)) {
-                        CERROR("Sequences space is exhausted\n");
+                        CERROR("%s: Sequences space is exhausted\n", 
+                               seq->lss_name);
                         RETURN(-ENOSPC);
                 } else {
                         range_alloc(out, space, seq->lss_super_width);
@@ -147,12 +148,11 @@ static int __seq_server_alloc_super(struct lu_server_seq *seq,
 
         rc = seq_store_write(seq, ctx);
         if (rc) {
-                CERROR("Can't save state, rc = %d\n",
-                       rc);
+                CERROR("%s: Can't save state, rc %d\n", seq->lss_name, rc);
                 RETURN(rc);
         }
 
-        CDEBUG(D_INFO, "%s: allocated super-sequence "
+        CDEBUG(D_INFO, "%s: Allocated super-sequence "
                DRANGE"\n", seq->lss_name, PRANGE(out));
 
         RETURN(rc);
@@ -189,7 +189,7 @@ static int __seq_server_alloc_meta(struct lu_server_seq *seq,
          * it is allocated from new super.
          */
         if (in != NULL) {
-                CDEBUG(D_INFO, "%s: recovery - use input range "
+                CDEBUG(D_INFO, "%s: Recovery - use input range "
                        DRANGE"\n", seq->lss_name, PRANGE(in));
 
                 if (range_is_exhausted(super)) {
@@ -221,14 +221,15 @@ static int __seq_server_alloc_meta(struct lu_server_seq *seq,
                  */
                 if (range_is_exhausted(super)) {
                         if (!seq->lss_cli) {
-                                CERROR("No seq-controller client is setup\n");
+                                CERROR("%s: No sequence controller client "
+                                       "is setup\n", seq->lss_name);
                                 RETURN(-EOPNOTSUPP);
                         }
 
                         rc = seq_client_alloc_super(seq->lss_cli, ctx);
                         if (rc) {
-                                CERROR("Can't allocate new super-sequence, "
-                                       "rc %d\n", rc);
+                                CERROR("%s: Can't allocate super-sequence, "
+                                       "rc %d\n", seq->lss_name, rc);
                                 RETURN(rc);
                         }
 
@@ -241,12 +242,12 @@ static int __seq_server_alloc_meta(struct lu_server_seq *seq,
 
         rc = seq_store_write(seq, ctx);
         if (rc) {
-                CERROR("Can't save state, rc = %d\n",
-                      rc);
+                CERROR("%s: Can't save state, rc = %d\n",
+                      seq->lss_name, rc);
         }
 
         if (rc == 0) {
-                CDEBUG(D_INFO, "%s: allocated meta-sequence "
+                CDEBUG(D_INFO, "%s: Allocated meta-sequence "
                        DRANGE"\n", seq->lss_name, PRANGE(out));
         }
 
@@ -279,7 +280,7 @@ static int seq_server_handle(struct lu_site *site,
         switch (opc) {
         case SEQ_ALLOC_META:
                 if (!site->ls_server_seq) {
-                        CERROR("Sequence-server is not "
+                        CERROR("Sequence server is not "
                                "initialized\n");
                         RETURN(-EINVAL);
                 }
@@ -443,8 +444,8 @@ static int seq_server_proc_init(struct lu_server_seq *seq)
         rc = lprocfs_add_vars(seq->lss_proc_dir,
                               seq_server_proc_list, seq);
         if (rc) {
-                CERROR("Can't init sequence manager "
-                       "proc, rc %d\n", rc);
+                CERROR("%s: Can't init sequence manager "
+                       "proc, rc %d\n", seq->lss_name, rc);
                 GOTO(out_cleanup, rc);
         }
 
@@ -496,8 +497,8 @@ int seq_server_init(struct lu_server_seq *seq,
         seq->lss_super_width = LUSTRE_SEQ_SUPER_WIDTH;
         seq->lss_meta_width = LUSTRE_SEQ_META_WIDTH;
 
-        snprintf(seq->lss_name, sizeof(seq->lss_name), "%s-%s",
-                 (is_srv ? "srv" : "ctl"), prefix);
+        snprintf(seq->lss_name, sizeof(seq->lss_name), 
+                 "%s-%s", (is_srv ? "srv" : "ctl"), prefix);
 
         seq->lss_space = LUSTRE_SEQ_SPACE_RANGE;
         seq->lss_super = LUSTRE_SEQ_ZERO_RANGE;
@@ -509,13 +510,13 @@ int seq_server_init(struct lu_server_seq *seq,
         /* request backing store for saved sequence info */
         rc = seq_store_read(seq, ctx);
         if (rc == -ENODATA) {
-                CDEBUG(D_INFO|D_WARNING, "%s: no data on "
-                       "storage was found, %s\n", seq->lss_name,
+                CDEBUG(D_INFO|D_WARNING, "%s: No data found "
+                       "on storage, %s\n", seq->lss_name,
                        is_srv ? "wait for controller attach" :
                        "this is first controller run");
         } else if (rc) {
-               CERROR("can't read sequence state, rc = %d\n",
-                      rc);
+               CERROR("%s: Can't read sequence state, rc %d\n",
+                      seq->lss_name, rc);
                GOTO(out, rc);
        }
 
@@ -525,12 +526,8 @@ int seq_server_init(struct lu_server_seq *seq,
 
        EXIT;
 out:
-       if (rc) {
+       if (rc)
                seq_server_fini(seq, ctx);
-        } else {
-                CDEBUG(D_INFO|D_WARNING, "%s Sequence Manager\n",
-                       (is_srv ? "Server" : "Controller"));
-        }
        return rc;
 }
 EXPORT_SYMBOL(seq_server_init);

diff --git a/lustre/fid/fid_request.c b/lustre/fid/fid_request.c
index 26da8b7..4c5babf 100644 (file)
--- a/lustre/fid/fid_request.c
+++ b/lustre/fid/fid_request.c
@@ -98,23 +98,22 @@ static int seq_client_rpc(struct lu_client_seq *seq,
         *range = *out;
 
         if (!range_is_sane(range)) {
-                CERROR("Invalid seq range obtained from server: "
-                       DRANGE"\n", PRANGE(range));
+                CERROR("%s: Invalid range received from server: "
+                       DRANGE"\n", seq->lcs_name, PRANGE(range));
                 GOTO(out_req, rc = -EINVAL);
         }
 
         if (range_is_exhausted(range)) {
-                CERROR("Seq range obtained from server is exhausted: "
-                       DRANGE"]\n", PRANGE(range));
+                CERROR("%s: Range received from server is exhausted: "
+                       DRANGE"]\n", seq->lcs_name, PRANGE(range));
                 GOTO(out_req, rc = -EINVAL);
         }
 
         /* Save server out to request for recovery case. */
         *in = *out;
                 
-        CDEBUG(D_INFO, "%s: allocated %s-sequence "
-               DRANGE"]\n", seq->lcs_name, opcname,
-               PRANGE(range));
+        CDEBUG(D_INFO, "%s: Allocated %s-sequence "DRANGE"]\n", 
+               seq->lcs_name, opcname, PRANGE(range));
         
         EXIT;
 out_req:
@@ -208,8 +207,8 @@ static int __seq_client_alloc_seq(struct lu_client_seq *seq, seqno_t *seqnr)
         if (range_space(&seq->lcs_range) == 0) {
                 rc = __seq_client_alloc_meta(seq, NULL);
                 if (rc) {
-                        CERROR("Can't allocate new meta-sequence, "
-                               "rc %d\n", rc);
+                        CERROR("%s: Can't allocate new meta-sequence, "
+                               "rc %d\n", seq->lcs_name, rc);
                         RETURN(rc);
                 }
         }
@@ -218,7 +217,7 @@ static int __seq_client_alloc_seq(struct lu_client_seq *seq, seqno_t *seqnr)
         *seqnr = seq->lcs_range.lr_start;
         seq->lcs_range.lr_start++;
 
-        CDEBUG(D_INFO, "%s: allocated sequence ["LPX64"]\n",
+        CDEBUG(D_INFO, "%s: Allocated sequence ["LPX64"]\n",
                seq->lcs_name, *seqnr);
         RETURN(rc);
 }
@@ -254,8 +253,8 @@ int seq_client_alloc_fid(struct lu_client_seq *seq, struct lu_fid *fid)
                  * or sequence is exhausted and should be switched. */
                 rc = __seq_client_alloc_seq(seq, &seqnr);
                 if (rc) {
-                        CERROR("Can't allocate new sequence, "
-                               "rc %d\n", rc);
+                        CERROR("%s: Can't allocate new sequence, "
+                               "rc %d\n", seq->lcs_name, rc);
                         GOTO(out, rc);
                 }
 
@@ -275,7 +274,7 @@ int seq_client_alloc_fid(struct lu_client_seq *seq, struct lu_fid *fid)
         *fid = seq->lcs_fid;
         LASSERT(fid_is_sane(fid));
 
-        CDEBUG(D_INFO, "%s: allocated FID "DFID"\n",
+        CDEBUG(D_INFO, "%s: Allocated FID "DFID"\n",
                seq->lcs_name, PFID(fid));
 
         EXIT;
@@ -298,7 +297,8 @@ static int seq_client_proc_init(struct lu_client_seq *seq)
                                              NULL, NULL);
 
         if (IS_ERR(seq->lcs_proc_dir)) {
-                CERROR("LProcFS failed in seq-init\n");
+                CERROR("%s: LProcFS failed in seq-init\n", 
+                       seq->lcs_name);
                 rc = PTR_ERR(seq->lcs_proc_dir);
                 RETURN(rc);
         }
@@ -306,8 +306,8 @@ static int seq_client_proc_init(struct lu_client_seq *seq)
         rc = lprocfs_add_vars(seq->lcs_proc_dir,
                               seq_client_proc_list, seq);
         if (rc) {
-                CERROR("Can't init sequence manager "
-                       "proc, rc %d\n", rc);
+                CERROR("%s: Can't init sequence manager "
+                       "proc, rc %d\n", seq->lcs_name, rc);
                 GOTO(out_cleanup, rc);
         }
 
@@ -373,9 +373,6 @@ int seq_client_init(struct lu_client_seq *seq,
         rc = seq_client_proc_init(seq);
         if (rc)
                 seq_client_fini(seq);
-        else
-                CDEBUG(D_INFO|D_WARNING,
-                       "Client Sequence Manager\n");
         RETURN(rc);
 }
 EXPORT_SYMBOL(seq_client_init);
@@ -392,10 +389,6 @@ void seq_client_fini(struct lu_client_seq *seq)
         }
 
         seq->lcs_srv = NULL;
-
-        CDEBUG(D_INFO|D_WARNING,
-               "Client Sequence Manager\n");
-
         EXIT;
 }
 EXPORT_SYMBOL(seq_client_fini);

diff --git a/lustre/fid/fid_store.c b/lustre/fid/fid_store.c
index 0a7356c..5489f2b 100644 (file)
--- a/lustre/fid/fid_store.c
+++ b/lustre/fid/fid_store.c
@@ -82,12 +82,9 @@ int seq_store_write(struct lu_server_seq *seq,
                                                     sizeof(info->sti_record),
                                                     &pos, th);
                 if (rc == sizeof(info->sti_record)) {
-                        CDEBUG(D_INFO|D_WARNING, "store %s ranges: space - "
-                               DRANGE", super - "DRANGE"\n",
-                               (seq->lss_type == LUSTRE_SEQ_SERVER ?
-                                "server" : "controller"),
+                        CDEBUG(D_INFO|D_WARNING, "%s: Store ranges: Space - "
+                               DRANGE", Super - "DRANGE"\n", seq->lss_name,
                                PRANGE(&seq->lss_space), PRANGE(&seq->lss_super));
-
                         rc = 0;
                 } else if (rc >= 0) {
                         rc = -EIO;
@@ -123,16 +120,15 @@ int seq_store_read(struct lu_server_seq *seq,
                 range_le_to_cpu(&seq->lss_space, &info->sti_record.ssr_space);
                 range_le_to_cpu(&seq->lss_super, &info->sti_record.ssr_super);
 
-                CDEBUG(D_INFO|D_WARNING, "Read %s ranges: space - "DRANGE", super "
-                       "- "DRANGE"\n", (seq->lss_type == LUSTRE_SEQ_SERVER ?
-                                        "server" : "controller"),
+                CDEBUG(D_INFO|D_WARNING, "%s: Read ranges: Space - "
+                       DRANGE", Super - "DRANGE"\n", seq->lss_name, 
                        PRANGE(&seq->lss_space), PRANGE(&seq->lss_super));
                 rc = 0;
         } else if (rc == 0) {
                 rc = -ENODATA;
         } else if (rc >= 0) {
-                CERROR("Read only %d bytes of %d\n", rc, 
-                       sizeof(info->sti_record));
+                CERROR("%s: Read only %d bytes of %d\n", seq->lss_name, 
+                       rc, sizeof(info->sti_record));
                 rc = -EIO;
         }
        
@@ -150,15 +146,15 @@ int seq_store_init(struct lu_server_seq *seq,
         ENTRY;
 
         name = seq->lss_type == LUSTRE_SEQ_SERVER ?
-                "seq_srv" : "seq_ctl";
+                LUSTRE_SEQ_SRV_NAME : LUSTRE_SEQ_CTL_NAME;
         
         dt_obj = dt_store_open(ctx, dt, name, &fid);
         if (!IS_ERR(dt_obj)) {
                 seq->lss_obj = dt_obj;
                rc = 0;
         } else {
-                CERROR("Can't find \"seq\" obj %d\n",
-                      (int)PTR_ERR(dt_obj));
+                CERROR("%s: Can't find \"%s\" obj %d\n",
+                      seq->lss_name, name, (int)PTR_ERR(dt_obj));
                 rc = PTR_ERR(dt_obj);
         }
 

diff --git a/lustre/fid/lproc_fid.c b/lustre/fid/lproc_fid.c
index 9f4e898..831a9bf 100644 (file)
--- a/lustre/fid/lproc_fid.c
+++ b/lustre/fid/lproc_fid.c
@@ -63,15 +63,9 @@ seq_proc_write_common(struct file *file, const char *buffer,
 
        LASSERT(range != NULL);
 
-        rc = sscanf(buffer, DRANGE"\n",
-                   &tmp.lr_start, &tmp.lr_end);
-
-       /* did not match 2 values */
-       if (rc != 2 || !range_is_sane(&tmp) || range_is_zero(&tmp)) {
-               CERROR("Can't parse input string or input is not correct\n");
+        rc = sscanf(buffer, "[%Lx - %Lx]\n", &tmp.lr_start, &tmp.lr_end);
+       if (rc != 2 || !range_is_sane(&tmp) || range_is_zero(&tmp))
                RETURN(-EINVAL);
-       }
-
        *range = tmp;
         RETURN(0);
 }
@@ -107,7 +101,7 @@ seq_proc_write_space(struct file *file, const char *buffer,
        rc = seq_proc_write_common(file, buffer, count,
                                    data, &seq->lss_space);
        if (rc == 0) {
-               CDEBUG(D_WARNING, "%s: sequences space has "
+               CDEBUG(D_WARNING, "%s: Sequences space has "
                        "changed to "DRANGE"\n", seq->lss_name,
                        PRANGE(&seq->lss_space));
        }
@@ -150,9 +144,8 @@ seq_proc_write_super(struct file *file, const char *buffer,
                                    data, &seq->lss_super);
 
        if (rc == 0) {
-               CDEBUG(D_WARNING, "%s: super-sequence has "
-                       "changed to "DRANGE"\n", seq->lss_name,
-                       PRANGE(&seq->lss_super));
+               CDEBUG(D_WARNING, "%s: Super has changed to "
+                       DRANGE"\n", seq->lss_name, PRANGE(&seq->lss_super));
        }
        
        up(&seq->lss_sem);
@@ -220,9 +213,8 @@ seq_proc_write_super_width(struct file *file, const char *buffer,
         seq->lss_super_width = val;
         
        if (rc == 0) {
-               CDEBUG(D_WARNING, "%s: super-sequence width "
-                       "has changed to "LPU64"\n", seq->lss_name,
-                       seq->lss_super_width);
+               CDEBUG(D_WARNING, "%s: Super width has changed to "
+                       LPU64"\n", seq->lss_name, seq->lss_super_width);
        }
        
        up(&seq->lss_sem);
@@ -267,9 +259,8 @@ seq_proc_write_meta_width(struct file *file, const char *buffer,
                 seq->lss_meta_width = val;
                 
                 if (rc == 0) {
-                        CDEBUG(D_WARNING, "%s: meta-sequence width "
-                               "has changed to "LPU64"\n", seq->lss_name, 
-                               seq->lss_meta_width);
+                        CDEBUG(D_WARNING, "%s: Meta width has changed to "
+                               LPU64"\n", seq->lss_name, seq->lss_meta_width);
                 }
         }
        
@@ -310,9 +301,8 @@ seq_proc_write_range(struct file *file, const char *buffer,
                                    data, &seq->lcs_range);
 
        if (rc == 0) {
-               CDEBUG(D_WARNING, "%s: range has changed to "
-                      DRANGE"\n", seq->lcs_name, 
-                       PRANGE(&seq->lcs_range));
+               CDEBUG(D_WARNING, "%s: Range has changed to "
+                      DRANGE"\n", seq->lcs_name, PRANGE(&seq->lcs_range));
        }
        
        up(&seq->lcs_sem);
@@ -358,7 +348,7 @@ seq_proc_write_seq_width(struct file *file, const char *buffer,
                 seq->lcs_width = val;
                 
                 if (rc == 0) {
-                        CDEBUG(D_WARNING, "%s: sequence width "
+                        CDEBUG(D_WARNING, "%s: Sequence width "
                                "has changed to "LPU64"\n",
                                seq->lcs_name, seq->lcs_width);
                 }

diff --git a/lustre/fld/fld_cache.c b/lustre/fld/fld_cache.c
index 5973545..d9ad23c 100644 (file)
--- a/lustre/fld/fld_cache.c
+++ b/lustre/fld/fld_cache.c
@@ -118,8 +118,7 @@ struct fld_cache_info *fld_cache_init(int hash_size, int cache_size,
         for (i = 0; i < hash_size; i++)
                 INIT_HLIST_HEAD(&cache->fci_hash_table[i]);
 
-        CDEBUG(D_INFO|D_WARNING, "FLD cache - htable: %d, "
-               "size: %d, threshold: %d\n", hash_size,
+        CDEBUG(D_INFO|D_WARNING, "FLD cache: Size: %d, Threshold: %d\n", 
                cache_size, cache_threshold);
 
         RETURN(cache);

diff --git a/lustre/fld/fld_handler.c b/lustre/fld/fld_handler.c
index 20c5f11..319b957 100644 (file)
--- a/lustre/fld/fld_handler.c
+++ b/lustre/fld/fld_handler.c
@@ -349,8 +349,6 @@ int fld_server_init(struct lu_server_fld *fld, struct dt_device *dt,
 out:
         if (rc)
                 fld_server_fini(fld, ctx);
-        else
-                CDEBUG(D_INFO|D_WARNING, "Server FLD\n");
         return rc;
 }
 EXPORT_SYMBOL(fld_server_init);

diff --git a/lustre/fld/fld_index.c b/lustre/fld/fld_index.c
index 07f6652..8bca12d 100644 (file)
--- a/lustre/fld/fld_index.c
+++ b/lustre/fld/fld_index.c
@@ -180,11 +180,11 @@ int fld_index_init(struct lu_server_fld *fld,
                 if (rc == 0)
                         LASSERT(dt_obj->do_index_ops != NULL);
                 else
-                        CERROR("File \"%s\" is not an index!\n",
-                               fld_index_name);
+                        CERROR("%s: File \"%s\" is not an index!\n",
+                               fld->lsf_name, fld_index_name);
         } else {
-                CERROR("Can't find \"%s\" obj %d\n",
-                       fld_index_name, (int)PTR_ERR(dt_obj));
+                CERROR("%s: Can't find \"%s\" obj %d\n",
+                       fld->lsf_name, fld_index_name, (int)PTR_ERR(dt_obj));
                 rc = PTR_ERR(dt_obj);
         }
 

diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c
index 1d90126..77cfb3f 100644 (file)
--- a/lustre/fld/fld_request.c
+++ b/lustre/fld/fld_request.c
@@ -140,7 +140,7 @@ int fld_client_add_target(struct lu_client_fld *fld,
         LASSERT(tar_name != NULL);
         LASSERT(tar->ft_srv != NULL || tar->ft_exp != NULL);
 
-        CDEBUG(D_INFO|D_WARNING, "%s: adding target %s\n",
+        CDEBUG(D_INFO|D_WARNING, "%s: Adding target %s\n",
               fld->lcf_name, tar_name);
 
         OBD_ALLOC_PTR(target);
@@ -216,7 +216,8 @@ static int fld_client_proc_init(struct lu_client_fld *fld)
                                              NULL, NULL);
 
         if (IS_ERR(fld->lcf_proc_dir)) {
-                CERROR("LProcFS failed in fld-init\n");
+                CERROR("%s: LProcFS failed in fld-init\n", 
+                       fld->lcf_name);
                 rc = PTR_ERR(fld->lcf_proc_dir);
                 RETURN(rc);
         }
@@ -224,7 +225,8 @@ static int fld_client_proc_init(struct lu_client_fld *fld)
         rc = lprocfs_add_vars(fld->lcf_proc_dir,
                               fld_client_proc_list, fld);
         if (rc) {
-                CERROR("Can't init FLD proc, rc %d\n", rc);
+                CERROR("%s: Can't init FLD proc, rc %d\n", 
+                       fld->lcf_name, rc);
                 GOTO(out_cleanup, rc);
         }
 
@@ -279,8 +281,12 @@ int fld_client_init(struct lu_client_fld *fld,
 
         LASSERT(fld != NULL);
 
+        snprintf(fld->lcf_name, sizeof(fld->lcf_name),
+                 "cli-%s", prefix);
+
         if (!hash_is_sane(hash)) {
-                CERROR("Wrong hash function %#x\n", hash);
+                CERROR("%s: Wrong hash function %#x\n", 
+                       fld->lcf_name, hash);
                 RETURN(-EINVAL);
         }
 
@@ -289,9 +295,6 @@ int fld_client_init(struct lu_client_fld *fld,
         fld->lcf_hash = &fld_hash[hash];
         INIT_LIST_HEAD(&fld->lcf_targets);
 
-        snprintf(fld->lcf_name, sizeof(fld->lcf_name),
-                 "cli-%s", prefix);
-
 #ifdef __KERNEL__
         cache_size = FLD_CACHE_SIZE /
                 sizeof(struct fld_cache_entry);
@@ -318,8 +321,8 @@ out:
                 fld_client_fini(fld);
         else
                 CDEBUG(D_INFO|D_WARNING,
-                       "Client FLD, using \"%s\" hash\n",
-                       fld->lcf_hash->fh_name);
+                       "%s: Using \"%s\" hash\n",
+                       fld->lcf_name, fld->lcf_hash->fh_name);
         return rc;
 }
 EXPORT_SYMBOL(fld_client_init);
@@ -350,7 +353,6 @@ void fld_client_fini(struct lu_client_fld *fld)
         }
 #endif
 
-        CDEBUG(D_INFO|D_WARNING, "Client FLD finalized\n");
         EXIT;
 }
 EXPORT_SYMBOL(fld_client_fini);
@@ -439,7 +441,8 @@ int fld_client_create(struct lu_client_fld *fld,
                  */
                 fld_cache_insert(fld->lcf_cache, seq, mds);
         } else {
-                CERROR("Can't create FLD entry, rc %d\n", rc);
+                CERROR("%s: Can't create FLD entry, rc %d\n", 
+                       fld->lcf_name, rc);
         }
         RETURN(rc);
 }

diff --git a/lustre/fld/lproc_fld.c b/lustre/fld/lproc_fld.c
index deee40a..83737bc 100644 (file)
--- a/lustre/fld/lproc_fld.c
+++ b/lustre/fld/lproc_fld.c
@@ -119,7 +119,7 @@ fld_proc_write_hash(struct file *file, const char *buffer,
                 fld->lcf_hash = hash;
                 spin_unlock(&fld->lcf_lock);
 
-                CDEBUG(D_WARNING, "%s: changed hash to \"%s\"\n",
+                CDEBUG(D_WARNING, "%s: Changed hash to \"%s\"\n",
                        fld->lcf_name, hash->fh_name);
         }
        
@@ -137,7 +137,7 @@ fld_proc_write_cache_flush(struct file *file, const char *buffer,
 
         fld_cache_flush(fld->lcf_cache);
         
-        CDEBUG(D_WARNING, "%s: lookup cache is flushed\n",
+        CDEBUG(D_WARNING, "%s: Lookup cache is flushed\n",
                fld->lcf_name);
        
         RETURN(count);

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 8cc1454..22986a2 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -182,7 +182,7 @@ static inline int range_is_exhausted(struct lu_range *r)
         return range_space(r) == 0;
 }
 
-#define DRANGE "["LPU64"-"LPU64"]"
+#define DRANGE "["LPX64"-"LPX64"]"
 
 #define PRANGE(range)      \
         (range)->lr_start, \

diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index 58fe2ee..3129353 100644 (file)
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -217,7 +217,8 @@ fid_build_res_name(const struct lu_fid *f,
         return name;
 }
 
-
+#define LUSTRE_SEQ_SRV_NAME "seq_srv"
+#define LUSTRE_SEQ_CTL_NAME "seq_ctl"
 
 /* Range common stuff */
 void range_cpu_to_le(struct lu_range *dst, const struct lu_range *src);