Attachment 309489 Details for Bug 436132 – patch2 - NFS: track number of writes on the wire and when last one started/ended

[patch] patch2 - NFS: track number of writes on the wire and when last one started/ended

02-nfs-track-number-of-writes-on-.patch (text/plain), 2.41 KB, created by Jeff Layton on 2008-06-16 13:15:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-06-16 13:15:37 UTC

Size: 2.41 KB

patch

obsolete

>NFS: track number of writes on the wire and when last one started/ended
>
>From: Jeff Layton <jlayton@redhat.com>
>
>Track the number of writes currently outstanding in the RPC queue, and
>also track when the last write call started and ended. Tracking this
>should give us information that we can use to determine whether an RPC
>call overlapped with a write.
>---
>
> fs/nfs/write.c         |   13 +++++++++++++
> include/linux/nfs_fs.h |    3 +++
> 2 files changed, 16 insertions(+), 0 deletions(-)
>
>
>diff --git a/fs/nfs/write.c b/fs/nfs/write.c
>index 6d8ace3..abd2c09 100644
>--- a/fs/nfs/write.c
>+++ b/fs/nfs/write.c
>@@ -785,6 +785,7 @@ static int nfs_write_rpcsetup(struct nfs_page *req,
> 		int how)
> {
> 	struct inode *inode = req->wb_context->path.dentry->d_inode;
>+	struct nfs_inode *nfsi = NFS_I(inode);
> 	int flags = (how & FLUSH_SYNC) ? 0 : RPC_TASK_ASYNC;
> 	int priority = flush_task_priority(how);
> 	struct rpc_task *task;
>@@ -832,6 +833,10 @@ static int nfs_write_rpcsetup(struct nfs_page *req,
> 	/* Set up the initial task struct.  */
> 	NFS_PROTO(inode)->write_setup(data, &msg);
> 
>+	/* update overlapping write detection info */
>+	nfsi->nwrites++;
>+	nfsi->last_write_start = jiffies;
>+	
> 	dprintk("NFS: %5u initiated write call "
> 		"(req %s/%Ld, %u bytes @ offset %Lu)\n",
> 		data->task.tk_pid,
>@@ -994,6 +999,10 @@ static void nfs_writeback_release_partial(void *calldata)
> 	struct nfs_page		*req = data->req;
> 	struct page		*page = req->wb_page;
> 	int status = data->task.tk_status;
>+	struct nfs_inode	*nfsi = NFS_I(data->inode);
>+
>+	nfsi->nwrites--;
>+	nfsi->last_write_done = jiffies;
> 
> 	if (status < 0) {
> 		nfs_set_pageerror(page);
>@@ -1049,6 +1058,10 @@ static void nfs_writeback_release_full(void *calldata)
> {
> 	struct nfs_write_data	*data = calldata;
> 	int status = data->task.tk_status;
>+	struct nfs_inode *nfsi = NFS_I(data->inode);
>+
>+	nfsi->nwrites--;
>+	nfsi->last_write_done = jiffies;
> 
> 	/* Update attributes as result of writeback. */
> 	while (!list_empty(&data->pages)) {
>diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
>index 051aa04..ae4394b 100644
>--- a/include/linux/nfs_fs.h
>+++ b/include/linux/nfs_fs.h
>@@ -165,6 +165,9 @@ struct nfs_inode {
> 	/* List of deferred sillydelete requests */
> 	struct hlist_head	silly_list;
> 	wait_queue_head_t	waitqueue;
>+	unsigned int		nwrites;		/* # writes on wire */
>+	unsigned long		last_write_start;
>+	unsigned long		last_write_done;
> 
> #ifdef CONFIG_NFS_V4
> 	struct nfs4_cached_acl	*nfs4_acl;

Actions: View | Diff

Attachments on bug 436132: 297190 | 297191 | 297250 | 297251 | 297252 | 309488 | 309489 | 309490 | 309620