mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
orangefs: g_orangefs_stats -> orangefs_stats for consistency
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
This commit is contained in:
parent
a0fe051592
commit
889d5f1bac
4 changed files with 7 additions and 8 deletions
|
@ -412,7 +412,7 @@ ssize_t orangefs_inode_read(struct inode *inode,
|
||||||
size_t bufmap_size;
|
size_t bufmap_size;
|
||||||
ssize_t ret = -EINVAL;
|
ssize_t ret = -EINVAL;
|
||||||
|
|
||||||
g_orangefs_stats.reads++;
|
orangefs_stats.reads++;
|
||||||
|
|
||||||
bufmap_size = orangefs_bufmap_size_query();
|
bufmap_size = orangefs_bufmap_size_query();
|
||||||
if (count > bufmap_size) {
|
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");
|
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);
|
rc = do_readv_writev(ORANGEFS_IO_READ, file, &pos, iter);
|
||||||
iocb->ki_pos = pos;
|
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;
|
iocb->ki_pos = pos;
|
||||||
g_orangefs_stats.writes++;
|
orangefs_stats.writes++;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
|
||||||
|
|
|
@ -298,7 +298,7 @@ struct orangefs_stats {
|
||||||
unsigned long writes;
|
unsigned long writes;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct orangefs_stats g_orangefs_stats;
|
extern struct orangefs_stats orangefs_stats;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* NOTE: See Documentation/filesystems/porting for information
|
* 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);
|
int orangefs_normalize_to_errno(__s32 error_code);
|
||||||
|
|
||||||
extern struct mutex request_mutex;
|
extern struct mutex request_mutex;
|
||||||
extern int debug;
|
|
||||||
extern int op_timeout_secs;
|
extern int op_timeout_secs;
|
||||||
extern int slot_timeout_secs;
|
extern int slot_timeout_secs;
|
||||||
extern int dcache_timeout_msecs;
|
extern int dcache_timeout_msecs;
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
* global variables declared here
|
* 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 */
|
/* the size of the hash tables for ops in progress */
|
||||||
int hash_table_size = 509;
|
int hash_table_size = 509;
|
||||||
|
|
|
@ -236,13 +236,13 @@ static ssize_t sysfs_int_show(struct kobject *kobj,
|
||||||
rc = scnprintf(buf,
|
rc = scnprintf(buf,
|
||||||
PAGE_SIZE,
|
PAGE_SIZE,
|
||||||
"%lu\n",
|
"%lu\n",
|
||||||
g_orangefs_stats.reads);
|
orangefs_stats.reads);
|
||||||
goto out;
|
goto out;
|
||||||
} else if (!strcmp(attr->attr.name, "writes")) {
|
} else if (!strcmp(attr->attr.name, "writes")) {
|
||||||
rc = scnprintf(buf,
|
rc = scnprintf(buf,
|
||||||
PAGE_SIZE,
|
PAGE_SIZE,
|
||||||
"%lu\n",
|
"%lu\n",
|
||||||
g_orangefs_stats.writes);
|
orangefs_stats.writes);
|
||||||
goto out;
|
goto out;
|
||||||
} else {
|
} else {
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Add table
Reference in a new issue