Merge branch 'odirect'

ccf01ef7 · Trond Myklebust · 82b145c5 · ccf01ef7 · ccf01ef7
Commit ccf01ef7 authored Jun 25, 2006 by Trond Myklebust
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 234 additions and 203 deletions

fs/nfs/direct.c fs/nfs/direct.c +234 -201

include/linux/nfs_xdr.h include/linux/nfs_xdr.h +0 -2

No files found.
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -729,7 +729,6 @@ struct nfs_read_data {
 	struct list_head	pages;	/* Coalesced read requests */
 	struct nfs_page		*req;	/* multi ops per nfs_page */
 	struct page		**pagevec;
-	unsigned int		npages;	/* active pages in pagevec */
 	struct nfs_readargs args;
 	struct nfs_readres  res;
 #ifdef CONFIG_NFS_V4
@@ -748,7 +747,6 @@ struct nfs_write_data {
 	struct list_head	pages;		/* Coalesced requests we wish to flush */
 	struct nfs_page		*req;		/* multi ops per nfs_page */
 	struct page		**pagevec;
-	unsigned int		npages;		/* active pages in pagevec */
 	struct nfs_writeargs	args;		/* argument struct */
 	struct nfs_writeres	res;		/* result struct */
 #ifdef CONFIG_NFS_V4