LU-1581 ofd: learn osd to be used from lmi

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

diff --git a/lustre/fid/lproc_fid.c b/lustre/fid/lproc_fid.c
index e9976f9..83e701d 100644 (file)
--- a/lustre/fid/lproc_fid.c
+++ b/lustre/fid/lproc_fid.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * 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.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,9 +40,6 @@
  * Author: Yury Umanets <umka@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_FID
 
 #ifdef __KERNEL__
@@ -77,7 +74,8 @@ seq_proc_write_common(struct file *file, const char *buffer,
 
        LASSERT(range != NULL);
 
-        rc = sscanf(buffer, "[%Lx - %Lx]\n",(long long unsigned *)&tmp.lsr_start,
+        rc = sscanf(buffer, "[%llx - %llx]\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);
@@ -94,7 +92,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 +110,16 @@ seq_server_proc_write_space(struct file *file, const char *buffer,
 
         LASSERT(seq != NULL);
 
-       down(&seq->lss_sem);
+        cfs_mutex_lock(&seq->lss_mutex);
        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_mutex_unlock(&seq->lss_mutex);
+
         RETURN(count);
 }
 
@@ -135,11 +133,11 @@ seq_server_proc_read_space(char *page, char **start, off_t off,
 
         LASSERT(seq != NULL);
 
-       down(&seq->lss_sem);
+        cfs_mutex_lock(&seq->lss_mutex);
        rc = seq_proc_read_common(page, start, off, count, eof,
                                   data, &seq->lss_space);
-       up(&seq->lss_sem);
-       
+        cfs_mutex_unlock(&seq->lss_mutex);
+
        RETURN(rc);
 }
 
@@ -167,7 +165,7 @@ seq_server_proc_read_server(char *page, char **start, off_t off,
        } else {
                rc = snprintf(page, count, "<none>\n");
        }
-       
+
        RETURN(rc);
 }
 
@@ -181,7 +179,7 @@ seq_server_proc_write_width(struct file *file, const char *buffer,
 
         LASSERT(seq != NULL);
 
-       down(&seq->lss_sem);
+        cfs_mutex_lock(&seq->lss_mutex);
 
         rc = lprocfs_write_helper(buffer, count, &val);
         if (rc)
@@ -193,9 +191,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_mutex_unlock(&seq->lss_mutex);
+
         RETURN(count);
 }
 
@@ -209,10 +207,10 @@ seq_server_proc_read_width(char *page, char **start, off_t off,
 
         LASSERT(seq != NULL);
 
-       down(&seq->lss_sem);
+        cfs_mutex_lock(&seq->lss_mutex);
         rc = snprintf(page, count, LPU64"\n", seq->lss_width);
-       up(&seq->lss_sem);
-       
+        cfs_mutex_unlock(&seq->lss_mutex);
+
        RETURN(rc);
 }
 
@@ -227,7 +225,7 @@ seq_client_proc_write_space(struct file *file, const char *buffer,
 
         LASSERT(seq != NULL);
 
-       down(&seq->lcs_sem);
+        cfs_mutex_lock(&seq->lcs_mutex);
        rc = seq_proc_write_common(file, buffer, count,
                                    data, &seq->lcs_space);
 
@@ -235,9 +233,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_mutex_unlock(&seq->lcs_mutex);
+
         RETURN(count);
 }
 
@@ -251,11 +249,11 @@ seq_client_proc_read_space(char *page, char **start, off_t off,
 
         LASSERT(seq != NULL);
 
-       down(&seq->lcs_sem);
+        cfs_mutex_lock(&seq->lcs_mutex);
        rc = seq_proc_read_common(page, start, off, count, eof,
                                   data, &seq->lcs_space);
-       up(&seq->lcs_sem);
-       
+        cfs_mutex_unlock(&seq->lcs_mutex);
+
        RETURN(rc);
 }
 
@@ -269,11 +267,13 @@ seq_client_proc_write_width(struct file *file, const char *buffer,
 
         LASSERT(seq != NULL);
 
-       down(&seq->lcs_sem);
+        cfs_mutex_lock(&seq->lcs_mutex);
 
         rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
+        if (rc) {
+                cfs_mutex_unlock(&seq->lcs_mutex);
                 RETURN(rc);
+        }
 
         if (val <= LUSTRE_SEQ_MAX_WIDTH && val > 0) {
                 seq->lcs_width = val;
@@ -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_mutex_unlock(&seq->lcs_mutex);
+
         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_mutex_lock(&seq->lcs_mutex);
         rc = snprintf(page, count, LPU64"\n", seq->lcs_width);
-       up(&seq->lcs_sem);
-       
+        cfs_mutex_unlock(&seq->lcs_mutex);
+
        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_mutex_lock(&seq->lcs_mutex);
         rc = snprintf(page, count, DFID"\n", PFID(&seq->lcs_fid));
-       up(&seq->lcs_sem);
-       
+        cfs_mutex_unlock(&seq->lcs_mutex);
+
        RETURN(rc);
 }