Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2701d086 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

NFSv4.1 add nfs_inode book keeping for mdsthreshold 



Keep track of the number of bytes read or written via buffered, direct, and
mem-mapped i/o for use by mdsthreshold size_io hints.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 82be417a

fs/nfs/direct.c

+2 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ static ssize_t nfs_direct_read(struct kiocb *iocb, const struct iovec *iov, 
	result = nfs_direct_read_schedule_iovec(dreq, iov, nr_segs, pos);

	if (!result)

		result = nfs_direct_wait(dreq);

	NFS_I(inode)->read_io += result;

out_release:

	nfs_direct_req_release(dreq);

out:
@@ -785,6 +786,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, 
		pos += vec->iov_len;

	}

	nfs_pageio_complete(&desc);

	NFS_I(dreq->inode)->write_io += desc.pg_bytes_written;



	/*

	 * If no bytes were started, return the error, and let the

fs/nfs/file.c

+1 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping, 


	if (status < 0)

		return status;

	NFS_I(mapping->host)->write_io += copied;

	return copied;

}

fs/nfs/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -323,6 +323,8 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr) 
		inode->i_gid = -2;

		inode->i_blocks = 0;

		memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));

		nfsi->write_io = 0;

		nfsi->read_io = 0;



		nfsi->read_cache_jiffies = fattr->time_start;

		nfsi->attr_gencount = fattr->gencount;

fs/nfs/pnfs.c

+3 −0
Original line number Diff line number Diff line
@@ -395,6 +395,9 @@ mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo, 
	dprintk("%s:Begin lo %p\n", __func__, lo);



	if (list_empty(&lo->plh_segs)) {

		/* Reset MDS Threshold I/O counters */

		NFS_I(lo->plh_inode)->write_io = 0;

		NFS_I(lo->plh_inode)->read_io = 0;

		if (!test_and_set_bit(NFS_LAYOUT_DESTROYED, &lo->plh_flags))

			put_layout_hdr_locked(lo);

		return 0;

fs/nfs/read.c

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode, 
	nfs_pageio_init_read(&pgio, inode, &nfs_async_read_completion_ops);

	nfs_pageio_add_request(&pgio, new);

	nfs_pageio_complete(&pgio);

	NFS_I(inode)->read_io += pgio.pg_bytes_written;

	return 0;

}
@@ -656,6 +657,7 @@ int nfs_readpages(struct file *filp, struct address_space *mapping, 
	ret = read_cache_pages(mapping, pages, readpage_async_filler, &desc);



	nfs_pageio_complete(&pgio);

	NFS_I(inode)->read_io += pgio.pg_bytes_written;

	npages = (pgio.pg_bytes_written + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;

	nfs_add_stats(inode, NFSIOS_READPAGES, npages);

read_complete: