Skip to content

Commit

Permalink
Revert "nfs: replace nfs_add_stats with nfs_inc_stats when add one"
Browse files Browse the repository at this point in the history
This reverts commit 5a254d0.

Since commit 5a254d0 ("nfs: replace nfs_add_stats with
nfs_inc_stats when add one"), nfs_readpage and nfs_do_writepage use
nfs_inc_stats to increment NFSIOS_READPAGES and NFSIOS_WRITEPAGES
instead of nfs_add_stats.

However nfs_inc_stats does not do the same thing as nfs_add_stats with
value 1 because these functions work on distinct stats:
nfs_inc_stats increments stats from "enum nfs_stat_eventcounters" (in
server->io_stats->events) and nfs_add_stats those from "enum
nfs_stat_bytecounters" (in server->io_stats->bytes).

Signed-off-by: Nicolas Iooss <[email protected]>
Fixes: 5a254d0 ("nfs: replace nfs_add_stats with nfs_inc_stats...")
Cc: [email protected] # 3.19+
Signed-off-by: Trond Myklebust <[email protected]>
  • Loading branch information
fishilico authored and trondmypd committed Apr 23, 2015
1 parent 7b32038 commit 3708f84
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion fs/nfs/read.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ int nfs_readpage(struct file *file, struct page *page)
dprintk("NFS: nfs_readpage (%p %ld@%lu)\n",
page, PAGE_CACHE_SIZE, page_file_index(page));
nfs_inc_stats(inode, NFSIOS_VFSREADPAGE);
nfs_inc_stats(inode, NFSIOS_READPAGES);
nfs_add_stats(inode, NFSIOS_READPAGES, 1);

/*
* Try to flush any pending writes to the file..
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/write.c
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ static int nfs_do_writepage(struct page *page, struct writeback_control *wbc, st
int ret;

nfs_inc_stats(inode, NFSIOS_VFSWRITEPAGE);
nfs_inc_stats(inode, NFSIOS_WRITEPAGES);
nfs_add_stats(inode, NFSIOS_WRITEPAGES, 1);

nfs_pageio_cond_complete(pgio, page_file_index(page));
ret = nfs_page_async_flush(pgio, page, wbc->sync_mode == WB_SYNC_NONE);
Expand Down

0 comments on commit 3708f84

Please sign in to comment.