diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 06:27:31 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 06:27:31 -0400 |
commit | ccf01ef7aa9c6c293a1c64c27331a2ce227916ec (patch) | |
tree | 421fa29aedff988e392f92780637553e275d37a0 /include | |
parent | 82b145c5a572f7fa7211dffe2097234dc91bcecc (diff) | |
download | linux-ccf01ef7aa9c6c293a1c64c27331a2ce227916ec.tar.gz linux-ccf01ef7aa9c6c293a1c64c27331a2ce227916ec.tar.bz2 linux-ccf01ef7aa9c6c293a1c64c27331a2ce227916ec.zip |
Merge branch 'odirect'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nfs_xdr.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 2d3fb6416d91..7c7320fa51aa 100644 --- 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 |