X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffld%2Flproc_fld.c;h=a2e02fa273ef841668bc646e420a65179b7f780b;hb=f7b585e7220e2b1c510ac7778f31f3ef99ac6c30;hp=d5e9e0787bd6e33a6c4840c011a261f9836c3a93;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git

diff --git a/lustre/fld/lproc_fld.c b/lustre/fld/lproc_fld.c
index d5e9e07..a2e02fa 100644
--- a/lustre/fld/lproc_fld.c
+++ b/lustre/fld/lproc_fld.c
@@ -16,8 +16,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -73,9 +73,9 @@ fld_proc_read_targets(char *page, char **start, off_t off,
 
         LASSERT(fld != NULL);
 
-        spin_lock(&fld->lcf_lock);
-        list_for_each_entry(target,
-                            &fld->lcf_targets, ft_chain)
+        cfs_spin_lock(&fld->lcf_lock);
+        cfs_list_for_each_entry(target,
+                                &fld->lcf_targets, ft_chain)
         {
                 rc = snprintf(page, count, "%s\n",
                               fld_target_name(target));
@@ -85,7 +85,7 @@ fld_proc_read_targets(char *page, char **start, off_t off,
                 if (count == 0)
                         break;
         }
-        spin_unlock(&fld->lcf_lock);
+        cfs_spin_unlock(&fld->lcf_lock);
 	RETURN(total);
 }
 
@@ -99,10 +99,10 @@ fld_proc_read_hash(char *page, char **start, off_t off,
 
         LASSERT(fld != NULL);
 
-        spin_lock(&fld->lcf_lock);
+        cfs_spin_lock(&fld->lcf_lock);
         rc = snprintf(page, count, "%s\n",
                       fld->lcf_hash->fh_name);
-        spin_unlock(&fld->lcf_lock);
+        cfs_spin_unlock(&fld->lcf_lock);
 
 	RETURN(rc);
 }
@@ -129,9 +129,9 @@ fld_proc_write_hash(struct file *file, const char *buffer,
         }
 
         if (hash != NULL) {
-                spin_lock(&fld->lcf_lock);
+                cfs_spin_lock(&fld->lcf_lock);
                 fld->lcf_hash = hash;
-                spin_unlock(&fld->lcf_lock);
+                cfs_spin_unlock(&fld->lcf_lock);
 
                 CDEBUG(D_INFO, "%s: Changed hash to \"%s\"\n",
                        fld->lcf_name, hash->fh_name);