orangefs: g_orangefs_stats -> orangefs_stats for consistency

Signed-off-by: Martin Brandenburg <martin@omnibond.com>

diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index 43c08b5..0578b99 100644 (file)
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -412,7 +412,7 @@ ssize_t orangefs_inode_read(struct inode *inode,
        size_t bufmap_size;
        ssize_t ret = -EINVAL;
 
-       g_orangefs_stats.reads++;
+       orangefs_stats.reads++;
 
        bufmap_size = orangefs_bufmap_size_query();
        if (count > bufmap_size) {
@@ -453,7 +453,7 @@ static ssize_t orangefs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter
 
        gossip_debug(GOSSIP_FILE_DEBUG, "orangefs_file_read_iter\n");
 
-       g_orangefs_stats.reads++;
+       orangefs_stats.reads++;
 
        rc = do_readv_writev(ORANGEFS_IO_READ, file, &pos, iter);
        iocb->ki_pos = pos;
@@ -514,7 +514,7 @@ static ssize_t orangefs_file_write_iter(struct kiocb *iocb, struct iov_iter *ite
        }
 
        iocb->ki_pos = pos;
-       g_orangefs_stats.writes++;
+       orangefs_stats.writes++;
 
 out:
 

diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index e1b50a1..761a1d8 100644 (file)
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -298,7 +298,7 @@ struct orangefs_stats {
        unsigned long writes;
 };
 
-extern struct orangefs_stats g_orangefs_stats;
+extern struct orangefs_stats orangefs_stats;
 
 /*
  * NOTE: See Documentation/filesystems/porting for information
@@ -511,7 +511,6 @@ bool orangefs_cancel_op_in_progress(struct orangefs_kernel_op_s *op);
 int orangefs_normalize_to_errno(__s32 error_code);
 
 extern struct mutex request_mutex;
-extern int debug;
 extern int op_timeout_secs;
 extern int slot_timeout_secs;
 extern int dcache_timeout_msecs;

diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c
index e37853c..f342a2c 100644 (file)
--- a/fs/orangefs/orangefs-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -21,7 +21,7 @@
  * global variables declared here
  */
 
-struct orangefs_stats g_orangefs_stats;
+struct orangefs_stats orangefs_stats;
 
 /* the size of the hash tables for ops in progress */
 int hash_table_size = 509;

diff --git a/fs/orangefs/orangefs-sysfs.c b/fs/orangefs/orangefs-sysfs.c
index dac2908..755c37c 100644 (file)
--- a/fs/orangefs/orangefs-sysfs.c
+++ b/fs/orangefs/orangefs-sysfs.c
@@ -236,13 +236,13 @@ static ssize_t sysfs_int_show(struct kobject *kobj,
                        rc = scnprintf(buf,
                                       PAGE_SIZE,
                                       "%lu\n",
-                                      g_orangefs_stats.reads);
+                                      orangefs_stats.reads);
                        goto out;
                } else if (!strcmp(attr->attr.name, "writes")) {
                        rc = scnprintf(buf,
                                       PAGE_SIZE,
                                       "%lu\n",
-                                      g_orangefs_stats.writes);
+                                      orangefs_stats.writes);
                        goto out;
                } else {
                        goto out;