diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2016-09-28 14:50:46 -0400 |
|---|---|---|
| committer | Martin Brandenburg <martin@omnibond.com> | 2016-09-28 14:50:46 -0400 |
| commit | b78b11985a36bfe768add17ffb70bbaf9d8d7627 (patch) | |
| tree | 20915bb2586b22567d408c753bba346f131fa759 /fs/orangefs/file.c | |
| parent | f808e138c0abd99bfce90ec8d4ef6406c2af714a (diff) | |
| parent | 1d503617884ed43af1c03685e73ce23f155d3fa4 (diff) | |
Merge branch 'misc' into for-next
Pull in an OrangeFS branch containing miscellaneous improvements.
- clean up debugfs globals
- remove dead code in sysfs
- reorganize duplicated sysfs attribute structs
- consolidate sysfs show and store functions
- remove duplicated sysfs_ops structures
- describe organization of sysfs
- make devreq_mutex static
- g_orangefs_stats -> orangefs_stats for consistency
- rename most remaining global variables
Diffstat (limited to 'fs/orangefs/file.c')
| -rw-r--r-- | fs/orangefs/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index fe5e1eac9561..3386886596d6 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: |