b=19387 integrate LST into acc-sm

[fs/lustre-release.git] / lustre / fid / lproc_fid.c

diff --git a/lustre/fid/lproc_fid.c b/lustre/fid/lproc_fid.c
index 963e358..b8fdca3 100644 (file)
--- a/lustre/fid/lproc_fid.c
+++ b/lustre/fid/lproc_fid.c
@@ -69,15 +69,16 @@
 static int
 seq_proc_write_common(struct file *file, const char *buffer,
                       unsigned long count, void *data,
-                      struct lu_range *range)
+                      struct lu_seq_range *range)
 {
-       struct lu_range tmp;
+       struct lu_seq_range tmp;
        int rc;
        ENTRY;
 
        LASSERT(range != NULL);
 
-        rc = sscanf(buffer, "[%Lx - %Lx]\n", &tmp.lr_start, &tmp.lr_end);
+        rc = sscanf(buffer, "[%Lx - %Lx]\n",(long long unsigned *)&tmp.lsr_start,
+                    (long long unsigned *)&tmp.lsr_end);
        if (rc != 2 || !range_is_sane(&tmp) || range_is_zero(&tmp))
                RETURN(-EINVAL);
        *range = tmp;
@@ -87,13 +88,13 @@ seq_proc_write_common(struct file *file, const char *buffer,
 static int
 seq_proc_read_common(char *page, char **start, off_t off,
                      int count, int *eof, void *data,
-                     struct lu_range *range)
+                     struct lu_seq_range *range)
 {
        int rc;
        ENTRY;
 
         *eof = 1;
-        rc = snprintf(page, count, "[%Lx - %Lx]\n",
+        rc = snprintf(page, count, "["LPX64" - "LPX64"]:%x\n",
                       PRANGE(range));
        RETURN(rc);
 }
@@ -111,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);
 }
 
@@ -134,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);
 }
 
@@ -166,7 +167,7 @@ seq_server_proc_read_server(char *page, char **start, off_t off,
        } else {
                rc = snprintf(page, count, "<none>\n");
        }
-       
+
        RETURN(rc);
 }
 
@@ -180,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)
@@ -192,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);
 }
 
@@ -208,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);
 }
 
@@ -226,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);
 
@@ -234,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);
 }
 
@@ -250,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);
 }
 
@@ -268,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)
@@ -282,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);
 }
 
@@ -298,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);
 }
 
@@ -315,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);
 }