Commit 6ddfd213 authored by Dave Wysochanski's avatar Dave Wysochanski Committed by Anna Schumaker
Browse files

NFS: In nfs_readpage() only increment NFSIOS_READPAGES when read succeeds 



There is a small inconsistency with nfs_readpage() vs nfs_readpages() with
regards to NFSIOS_READPAGES.  In readpage we unconditionally increment
NFSIOS_READPAGES at the top, which means even if the read fails.  In
readpages, we increment NFSIOS_READPAGES at the bottom based on how
many pages were successfully read.  Change readpage to be consistent with
readpages and so NFSIOS_READPAGES only reflects successful, non-fscache
reads.

Signed-off-by: default avatarDave Wysochanski <dwysocha@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 49dee700

fs/nfs/read.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ int nfs_readpage(struct file *file, struct page *page) 
	dprintk("NFS: nfs_readpage (%p %ld@%lu)\n",

		page, PAGE_SIZE, page_index(page));

	nfs_inc_stats(inode, NFSIOS_VFSREADPAGE);

	nfs_add_stats(inode, NFSIOS_READPAGES, 1);



	/*

	 * Try to flush any pending writes to the file..
@@ -359,6 +358,7 @@ int nfs_readpage(struct file *file, struct page *page) 
		if (!PageUptodate(page) && !ret)

			ret = xchg(&ctx->error, 0);

	}

	nfs_add_stats(inode, NFSIOS_READPAGES, 1);

out:

	put_nfs_open_context(ctx);

	return ret;