]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "nfs: replace nfs_add_stats with nfs_inc_stats when add one"
authorNicolas Iooss <nicolas.iooss_linux@m4x.org>
Thu, 16 Apr 2015 10:48:39 +0000 (18:48 +0800)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Thu, 23 Apr 2015 19:16:15 +0000 (15:16 -0400)
commitbd0fb20cb0f37752e6f62c9b1720686c28c4ab48
treeda21160011ca88efc8d1a549713a33bcd4e14a36
parenta8be324aeb8cf7459d38024d51b150d1c288c2f1
Revert "nfs: replace nfs_add_stats with nfs_inc_stats when add one"

This reverts commit 656feefbee293fd81bd052c2fad7ea068a473d11.

Since commit 656feefbee29 ("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 <nicolas.iooss_linux@m4x.org>
Fixes: 656feefbee29 ("nfs: replace nfs_add_stats with nfs_inc_stats...")
Cc: stable@vger.kernel.org # 3.19+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
fs/nfs/read.c
fs/nfs/write.c