From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 3 Jan 2006 08:55:35 +0000 (+0100)
Subject: NFS: Make directIO aware of compound pages...
X-Git-Tag: v2.6.16-rc1~935^2~4^2~25
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=566dd6064e89b15ff2dec666a421bebf0f98f26c;p=linux-2.6-omap-h63xx.git

NFS: Make directIO aware of compound pages...

 ...and avoid calling set_page_dirty on them

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index fd7ac5e841c..10ae377e68f 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -122,9 +122,10 @@ nfs_free_user_pages(struct page **pages, int npages, int do_dirty)
 {
 	int i;
 	for (i = 0; i < npages; i++) {
-		if (do_dirty)
-			set_page_dirty_lock(pages[i]);
-		page_cache_release(pages[i]);
+		struct page *page = pages[i];
+		if (do_dirty && !PageCompound(page))
+			set_page_dirty_lock(page);
+		page_cache_release(page);
 	}
 	kfree(pages);
 }