- changed prefix in struct fld_cache_info from "fld_" to "fci_";

- changed prefix in struct fld_cache_entry from "fld_" to "fce_".

diff --git a/lustre/fld/fld_handler.c b/lustre/fld/fld_handler.c
index b790263..39be7e9 100644 (file)
--- a/lustre/fld/fld_handler.c
+++ b/lustre/fld/fld_handler.c
@@ -65,19 +65,19 @@ static int fld_init(void)
         if (fld_cache == NULL)
                 RETURN(-ENOMEM);
 
-        spin_lock_init(&fld_cache->fld_lock);
+        spin_lock_init(&fld_cache->fci_lock);
 
         /* init fld cache info */
-        fld_cache->fld_hash_mask = FLD_HTABLE_MASK;
-        OBD_ALLOC(fld_cache->fld_hash, FLD_HTABLE_SIZE *
-                  sizeof(*fld_cache->fld_hash));
-        if (fld_cache->fld_hash == NULL) {
+        fld_cache->fci_hash_mask = FLD_HTABLE_MASK;
+        OBD_ALLOC(fld_cache->fci_hash, FLD_HTABLE_SIZE *
+                  sizeof(*fld_cache->fci_hash));
+        if (fld_cache->fci_hash == NULL) {
                 OBD_FREE_PTR(fld_cache);
                 RETURN(-ENOMEM);
         }
         
         for (i = 0; i < FLD_HTABLE_SIZE; i++)
-                INIT_HLIST_HEAD(&fld_cache->fld_hash[i]);
+                INIT_HLIST_HEAD(&fld_cache->fci_hash[i]);
 
         CDEBUG(D_INFO|D_WARNING, "Client FLD, cache size %d\n",
                FLD_HTABLE_SIZE);
@@ -89,8 +89,8 @@ static int fld_fini(void)
 {
         ENTRY;
         if (fld_cache != NULL) {
-                OBD_FREE(fld_cache->fld_hash, FLD_HTABLE_SIZE *
-                         sizeof(*fld_cache->fld_hash));
+                OBD_FREE(fld_cache->fci_hash, FLD_HTABLE_SIZE *
+                         sizeof(*fld_cache->fci_hash));
                 OBD_FREE_PTR(fld_cache);
         }
         RETURN(0);

diff --git a/lustre/fld/fld_internal.h b/lustre/fld/fld_internal.h
index 23de30f..181027f 100644 (file)
--- a/lustre/fld/fld_internal.h
+++ b/lustre/fld/fld_internal.h
@@ -31,15 +31,15 @@
 typedef __u64 fidseq_t;
 
 struct fld_cache_entry {
-        struct hlist_node  fld_list;
-        mdsno_t            fld_mds;
-        __u64              fld_seq;
+        struct hlist_node  fce_list;
+        mdsno_t            fce_mds;
+        __u64              fce_seq;
 };
 
 struct fld_cache_info {
-        struct hlist_head *fld_hash;
-        spinlock_t         fld_lock;
-        int                fld_hash_mask;
+        struct hlist_head *fci_hash;
+        spinlock_t         fci_lock;
+        int                fci_hash_mask;
 };
 
 enum fld_op {

diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c
index 1ddb083..a93e16b 100644 (file)
--- a/lustre/fld/fld_request.c
+++ b/lustre/fld/fld_request.c
@@ -73,24 +73,24 @@ fld_cache_insert(struct fld_cache_info *fld_cache,
         if (!flde)
                 RETURN(-ENOMEM);
 
-        bucket = fld_cache->fld_hash + (fld_cache_hash(seq) &
-                                        fld_cache->fld_hash_mask);
+        bucket = fld_cache->fci_hash + (fld_cache_hash(seq) &
+                                        fld_cache->fci_hash_mask);
 
-        spin_lock(&fld_cache->fld_lock);
-        hlist_for_each_entry(fldt, scan, bucket, fld_list) {
-                if (fldt->fld_seq == seq)
+        spin_lock(&fld_cache->fci_lock);
+        hlist_for_each_entry(fldt, scan, bucket, fce_list) {
+                if (fldt->fce_seq == seq)
                         GOTO(exit_unlock, rc = -EEXIST);
         }
 
-        INIT_HLIST_NODE(&flde->fld_list);
-        flde->fld_mds = mds;
-        flde->fld_seq = seq;
+        INIT_HLIST_NODE(&flde->fce_list);
+        flde->fce_mds = mds;
+        flde->fce_seq = seq;
         
-        hlist_add_head(&flde->fld_list, bucket);
+        hlist_add_head(&flde->fce_list, bucket);
 
         EXIT;
 exit_unlock:
-        spin_unlock(&fld_cache->fld_lock);
+        spin_unlock(&fld_cache->fci_lock);
         if (rc != 0)
                 OBD_FREE_PTR(flde);
         return rc;
@@ -104,20 +104,20 @@ fld_cache_delete(struct fld_cache_info *fld_cache, __u64 seq)
         struct hlist_node *scan;
         ENTRY;
 
-        bucket = fld_cache->fld_hash + (fld_cache_hash(seq) &
-                                        fld_cache->fld_hash_mask);
+        bucket = fld_cache->fci_hash + (fld_cache_hash(seq) &
+                                        fld_cache->fci_hash_mask);
 
-        spin_lock(&fld_cache->fld_lock);
-        hlist_for_each_entry(flde, scan, bucket, fld_list) {
-                if (flde->fld_seq == seq) {
-                        hlist_del_init(&flde->fld_list);
+        spin_lock(&fld_cache->fci_lock);
+        hlist_for_each_entry(flde, scan, bucket, fce_list) {
+                if (flde->fce_seq == seq) {
+                        hlist_del_init(&flde->fce_list);
                         GOTO(out_unlock, 0);
                 }
         }
 
         EXIT;
 out_unlock:
-        spin_unlock(&fld_cache->fld_lock);
+        spin_unlock(&fld_cache->fci_lock);
         return;
 }
 
@@ -129,17 +129,17 @@ fld_cache_lookup(struct fld_cache_info *fld_cache, __u64 seq)
         struct hlist_node *scan;
         ENTRY;
 
-        bucket = fld_cache->fld_hash + (fld_cache_hash(seq) &
-                                        fld_cache->fld_hash_mask);
+        bucket = fld_cache->fci_hash + (fld_cache_hash(seq) &
+                                        fld_cache->fci_hash_mask);
 
-        spin_lock(&fld_cache->fld_lock);
-        hlist_for_each_entry(flde, scan, bucket, fld_list) {
-                if (flde->fld_seq == seq) {
-                        spin_unlock(&fld_cache->fld_lock);
+        spin_lock(&fld_cache->fci_lock);
+        hlist_for_each_entry(flde, scan, bucket, fce_list) {
+                if (flde->fce_seq == seq) {
+                        spin_unlock(&fld_cache->fci_lock);
                         RETURN(flde);
                 }
         }
-        spin_unlock(&fld_cache->fld_lock);
+        spin_unlock(&fld_cache->fci_lock);
         RETURN(NULL);
 }
 #endif
@@ -496,7 +496,7 @@ fld_client_lookup(struct lu_client_fld *fld,
         /* lookup it in the cache */
         flde = fld_cache_lookup(fld_cache, seq);
         if (flde != NULL) {
-                *mds = flde->fld_mds;
+                *mds = flde->fce_mds;
                 RETURN(0);
         }
 #endif

diff --git a/lustre/lmv/lmv_fld.c b/lustre/lmv/lmv_fld.c
index 5ebc72a..8465152 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_WARNING, "LMV: got MDS "LPU64" for sequence: "LPU64"\n",
+        CDEBUG(D_TRACE, "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",