Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 889d5f1b authored by Martin Brandenburg's avatar Martin Brandenburg
Browse files

orangefs: g_orangefs_stats -> orangefs_stats for consistency 



Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
parent a0fe0515

fs/orangefs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -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:

fs/orangefs/orangefs-kernel.h

+1 −2
Original line number Diff line number Diff line
@@ -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;

fs/orangefs/orangefs-mod.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/orangefs/orangefs-sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -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;