]> git.hungrycats.org Git - linux/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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 May 2015 20:04:04 +0000 (22:04 +0200)
commit04dcce2b2b45c99fdaebd0baa19640674ea388f4
tree94a0e52103a41f6ac7a0c32666b89e69fcfcf850
parentf5e360ea796b5833aa7ddf281ed49d72f9eba1e3
Revert "nfs: replace nfs_add_stats with nfs_inc_stats when add one"

commit 3708f842e107b9b79d54a75d152e666b693649e8 upstream.

This reverts commit 5a254d08b086d80cbead2ebcee6d2a4b3a15587a.

Since commit 5a254d08b086 ("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: 5a254d08b086 ("nfs: replace nfs_add_stats with nfs_inc_stats...")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfs/read.c
fs/nfs/write.c