X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=inline;f=lustre%2Ffid%2Flproc_fid.c;h=70b5c9c63cd56055168783b6400e179d2230373d;hb=06a67987e06f7fa9c0bfde549d54e2bed0a78ade;hp=e9976f96ee3bc68fcc2dbd236bd3e91fa964d8e9;hpb=4201416b775b14d6e4cd89b7c68bb1c1bc950144;p=fs%2Flustre-release.git

diff --git a/lustre/fid/lproc_fid.c b/lustre/fid/lproc_fid.c
index e9976f9..70b5c9c 100644
--- a/lustre/fid/lproc_fid.c
+++ b/lustre/fid/lproc_fid.c
@@ -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.
  */
 /*
@@ -94,7 +94,7 @@ seq_proc_read_common(char *page, char **start, off_t off,
 	ENTRY;
 
         *eof = 1;
-        rc = snprintf(page, count, "["LPX64" - "LPX64"]:%x\n",
+        rc = snprintf(page, count, "["LPX64" - "LPX64"]:%x:%x\n",
                       PRANGE(range));
 	RETURN(rc);
 }
@@ -112,16 +112,16 @@ seq_server_proc_write_space(struct file *file, const char *buffer,
 
         LASSERT(seq != NULL);
 
-	down(&seq->lss_sem);
+        cfs_down(&seq->lss_sem);
 	rc = seq_proc_write_common(file, buffer, count,
                                    data, &seq->lss_space);
 	if (rc == 0) {
 		CDEBUG(D_INFO, "%s: Space: "DRANGE"\n",
                        seq->lss_name, PRANGE(&seq->lss_space));
 	}
-	
-	up(&seq->lss_sem);
-	
+
+        cfs_up(&seq->lss_sem);
+
         RETURN(count);
 }
 
@@ -135,11 +135,11 @@ seq_server_proc_read_space(char *page, char **start, off_t off,
 
         LASSERT(seq != NULL);
 
-	down(&seq->lss_sem);
+        cfs_down(&seq->lss_sem);
 	rc = seq_proc_read_common(page, start, off, count, eof,
                                   data, &seq->lss_space);
-	up(&seq->lss_sem);
-	
+        cfs_up(&seq->lss_sem);
+
 	RETURN(rc);
 }
 
@@ -167,7 +167,7 @@ seq_server_proc_read_server(char *page, char **start, off_t off,
 	} else {
 		rc = snprintf(page, count, "<none>\n");
 	}
-	
+
 	RETURN(rc);
 }
 
@@ -181,7 +181,7 @@ seq_server_proc_write_width(struct file *file, const char *buffer,
 
         LASSERT(seq != NULL);
 
-	down(&seq->lss_sem);
+        cfs_down(&seq->lss_sem);
 
         rc = lprocfs_write_helper(buffer, count, &val);
         if (rc)
@@ -193,9 +193,9 @@ seq_server_proc_write_width(struct file *file, const char *buffer,
 		CDEBUG(D_INFO, "%s: Width: "LPU64"\n",
                        seq->lss_name, seq->lss_width);
 	}
-	
-	up(&seq->lss_sem);
-	
+
+        cfs_up(&seq->lss_sem);
+
         RETURN(count);
 }
 
@@ -209,10 +209,10 @@ seq_server_proc_read_width(char *page, char **start, off_t off,
 
         LASSERT(seq != NULL);
 
-	down(&seq->lss_sem);
+        cfs_down(&seq->lss_sem);
         rc = snprintf(page, count, LPU64"\n", seq->lss_width);
-	up(&seq->lss_sem);
-	
+        cfs_up(&seq->lss_sem);
+
 	RETURN(rc);
 }
 
@@ -227,7 +227,7 @@ seq_client_proc_write_space(struct file *file, const char *buffer,
 
         LASSERT(seq != NULL);
 
-	down(&seq->lcs_sem);
+        cfs_down(&seq->lcs_sem);
 	rc = seq_proc_write_common(file, buffer, count,
                                    data, &seq->lcs_space);
 
@@ -235,9 +235,9 @@ seq_client_proc_write_space(struct file *file, const char *buffer,
 		CDEBUG(D_INFO, "%s: Space: "DRANGE"\n",
                        seq->lcs_name, PRANGE(&seq->lcs_space));
 	}
-	
-	up(&seq->lcs_sem);
-	
+
+        cfs_up(&seq->lcs_sem);
+
         RETURN(count);
 }
 
@@ -251,11 +251,11 @@ seq_client_proc_read_space(char *page, char **start, off_t off,
 
         LASSERT(seq != NULL);
 
-	down(&seq->lcs_sem);
+        cfs_down(&seq->lcs_sem);
 	rc = seq_proc_read_common(page, start, off, count, eof,
                                   data, &seq->lcs_space);
-	up(&seq->lcs_sem);
-	
+        cfs_up(&seq->lcs_sem);
+
 	RETURN(rc);
 }
 
@@ -269,7 +269,7 @@ seq_client_proc_write_width(struct file *file, const char *buffer,
 
         LASSERT(seq != NULL);
 
-	down(&seq->lcs_sem);
+        cfs_down(&seq->lcs_sem);
 
         rc = lprocfs_write_helper(buffer, count, &val);
         if (rc)
@@ -283,9 +283,9 @@ seq_client_proc_write_width(struct file *file, const char *buffer,
                                seq->lcs_name, seq->lcs_width);
                 }
         }
-	
-	up(&seq->lcs_sem);
-	
+
+        cfs_up(&seq->lcs_sem);
+
         RETURN(count);
 }
 
@@ -299,10 +299,10 @@ seq_client_proc_read_width(char *page, char **start, off_t off,
 
         LASSERT(seq != NULL);
 
-	down(&seq->lcs_sem);
+        cfs_down(&seq->lcs_sem);
         rc = snprintf(page, count, LPU64"\n", seq->lcs_width);
-	up(&seq->lcs_sem);
-	
+        cfs_up(&seq->lcs_sem);
+
 	RETURN(rc);
 }
 
@@ -316,10 +316,10 @@ seq_client_proc_read_fid(char *page, char **start, off_t off,
 
         LASSERT(seq != NULL);
 
-	down(&seq->lcs_sem);
+        cfs_down(&seq->lcs_sem);
         rc = snprintf(page, count, DFID"\n", PFID(&seq->lcs_fid));
-	up(&seq->lcs_sem);
-	
+        cfs_up(&seq->lcs_sem);
+
 	RETURN(rc);
 }