diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-28 16:52:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-28 16:52:45 -0400 |
| commit | 607f31e80b6f982d7c0dd7a5045377fc368fe507 (patch) | |
| tree | caa7087b1aa90fe620f8a7a564bf07d94f8c1b69 /include | |
| parent | 79bc79b07c9c6f8ae9290704e9e503a9327fcbb2 (diff) | |
| download | linux-607f31e80b6f982d7c0dd7a5045377fc368fe507.tar.gz linux-607f31e80b6f982d7c0dd7a5045377fc368fe507.tar.bz2 linux-607f31e80b6f982d7c0dd7a5045377fc368fe507.zip | |
Revert "Merge branch 'odirect'"
This reverts ccf01ef7aa9c6c293a1c64c27331a2ce227916ec commit.
No idea how git managed this one: when I asked it to merge the odirect
topic branch it actually generated a patch which reverted the change.
Reverting the 'merge' will once again reveal Chuck's recent NFS/O_DIRECT
work to the world.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfs_xdr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 7c7320fa51aa..2d3fb6416d91 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -729,6 +729,7 @@ 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 @@ -747,6 +748,7 @@ 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 |