Attachment 601525 Details for Bug 736578 – patch -- skip lockowner related checks on v2/3 mounts

[patch] patch -- skip lockowner related checks on v2/3 mounts

0001-nfs-allow-coalescing-of-requests-from-different-lock.patch (text/plain), 1.96 KB, created by Jeff Layton on 2012-07-31 13:36:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2012-07-31 13:36:28 UTC

Size: 1.96 KB

patch

obsolete

>From 93e564be31cae33d9e21c71bc3833411c7330fe7 Mon Sep 17 00:00:00 2001
>From: Jeff Layton <jlayton@redhat.com>
>Date: Tue, 31 Jul 2012 09:22:03 -0400
>Subject: [PATCH] nfs: allow coalescing of requests from different lockowners
> for v2/3 mounts
>
>Signed-off-by: Jeff Layton <jlayton@redhat.com>
>---
> fs/nfs/pagelist.c | 12 ++++++++----
> fs/nfs/write.c    |  4 ++--
> 2 files changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
>index aed913c..754968b 100644
>--- a/fs/nfs/pagelist.c
>+++ b/fs/nfs/pagelist.c
>@@ -286,16 +286,20 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev,
> {
> 	if (req->wb_context->cred != prev->wb_context->cred)
> 		return false;
>-	if (req->wb_lock_context->lockowner != prev->wb_lock_context->lockowner)
>-		return false;
>-	if (req->wb_context->state != prev->wb_context->state)
>-		return false;
> 	if (req->wb_pgbase != 0)
> 		return false;
> 	if (prev->wb_pgbase + prev->wb_bytes != PAGE_CACHE_SIZE)
> 		return false;
> 	if (req_offset(req) != req_offset(prev) + prev->wb_bytes)
> 		return false;
>+	/* no need to do following checks if this is not stateful mount */
>+	if (!req->wb_context->state)
>+		goto out;
>+	if (req->wb_context->state != prev->wb_context->state)
>+		return false;
>+	if (req->wb_lock_context->lockowner != prev->wb_lock_context->lockowner)
>+		return false;
>+out:
> 	return pgio->pg_ops->pg_test(pgio, prev, req);
> }
> 
>diff --git a/fs/nfs/write.c b/fs/nfs/write.c
>index 4d6861c..0b1d73f 100644
>--- a/fs/nfs/write.c
>+++ b/fs/nfs/write.c
>@@ -836,8 +836,8 @@ int nfs_flush_incompatible(struct file *file, struct page *page)
> 		if (req == NULL)
> 			return 0;
> 		do_flush = req->wb_page != page || req->wb_context != ctx ||
>-			req->wb_lock_context->lockowner != current->files ||
>-			req->wb_lock_context->pid != current->tgid;
>+			(ctx->state && (req->wb_lock_context->lockowner != current->files ||
>+			req->wb_lock_context->pid != current->tgid));
> 		nfs_release_request(req);
> 		if (!do_flush)
> 			return 0;
>-- 
>1.7.11.2
>

Actions: View | Diff

Attachments on bug 736578: 601525