diff options
| author |   Martin Brandenburg <martin@omnibond.com> | 2016-08-15 15:33:42 -0400 |
|---|---|---|
| committer | Martin Brandenburg <martin@omnibond.com> | 2016-08-15 15:33:42 -0400 |
| commit | 889d5f1baca698a4510174cdd6a6596997d0deb4 (patch) | |
| tree | 2e7778620a3600f42ca815eb324caf14172e48d0 | |
| parent | orangefs: make devreq_mutex static (diff) | |
| download | linux-dev-889d5f1baca698a4510174cdd6a6596997d0deb4.tar.xz linux-dev-889d5f1baca698a4510174cdd6a6596997d0deb4.zip | |
orangefs: g_orangefs_stats -> orangefs_stats for consistency
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
| -rw-r--r-- | fs/orangefs/file.c | 6 | ||||
| -rw-r--r-- | fs/orangefs/orangefs-kernel.h | 3 | ||||
| -rw-r--r-- | fs/orangefs/orangefs-mod.c | 2 | ||||
| -rw-r--r-- | fs/orangefs/orangefs-sysfs.c | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index 43c08b5c7168..0578b99f5471 100644 --- 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 e1b50a11bc5f..761a1d852979 100644 --- 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 e37853c78361..f342a2cef1e3 100644 --- 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 dac2908c0c27..755c37c998cf 100644 --- 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; |