aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-01-03 09:55:35 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-01-06 14:58:50 -0500
commit566dd6064e89b15ff2dec666a421bebf0f98f26c (patch)
tree45ccdc3084c56557ba5baeae771be7c1e0564ae5 /fs
parent70b9ecbdb9c5fdc731f8780bffd45d9519020c4a (diff)
NFS: Make directIO aware of compound pages...
...and avoid calling set_page_dirty on them Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/direct.c7
1 files changed, 4 insertions, 3 deletions
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);
}