diff options
-rw-r--r-- | fs/nfs/pagelist.c | 1 | ||||
-rw-r--r-- | fs/nfs/write.c | 1 | ||||
-rw-r--r-- | include/linux/nfs_page.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 4cf2a68493e0..5d01a1651084 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -114,7 +114,6 @@ nfs_create_request(struct nfs_open_context *ctx, struct inode *inode, | |||
114 | * long write-back delay. This will be adjusted in | 114 | * long write-back delay. This will be adjusted in |
115 | * update_nfs_request below if the region is not locked. */ | 115 | * update_nfs_request below if the region is not locked. */ |
116 | req->wb_page = page; | 116 | req->wb_page = page; |
117 | atomic_set(&req->wb_complete, 0); | ||
118 | req->wb_index = page->index; | 117 | req->wb_index = page->index; |
119 | page_cache_get(page); | 118 | page_cache_get(page); |
120 | BUG_ON(PagePrivate(page)); | 119 | BUG_ON(PagePrivate(page)); |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 150397279b8d..705bf01cfbba 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -1059,7 +1059,6 @@ static int nfs_flush_multi(struct nfs_pageio_descriptor *desc, | |||
1059 | nbytes -= len; | 1059 | nbytes -= len; |
1060 | offset += len; | 1060 | offset += len; |
1061 | } while (nbytes != 0); | 1061 | } while (nbytes != 0); |
1062 | atomic_set(&req->wb_complete, requests); | ||
1063 | desc->pg_rpc_callops = &nfs_write_common_ops; | 1062 | desc->pg_rpc_callops = &nfs_write_common_ops; |
1064 | return ret; | 1063 | return ret; |
1065 | 1064 | ||
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index bc5b7a5e787e..0a5b63f16116 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h | |||
@@ -36,7 +36,6 @@ struct nfs_page { | |||
36 | struct page *wb_page; /* page to read in/write out */ | 36 | struct page *wb_page; /* page to read in/write out */ |
37 | struct nfs_open_context *wb_context; /* File state context info */ | 37 | struct nfs_open_context *wb_context; /* File state context info */ |
38 | struct nfs_lock_context *wb_lock_context; /* lock context info */ | 38 | struct nfs_lock_context *wb_lock_context; /* lock context info */ |
39 | atomic_t wb_complete; /* i/os we're waiting for */ | ||
40 | pgoff_t wb_index; /* Offset >> PAGE_CACHE_SHIFT */ | 39 | pgoff_t wb_index; /* Offset >> PAGE_CACHE_SHIFT */ |
41 | unsigned int wb_offset, /* Offset & ~PAGE_CACHE_MASK */ | 40 | unsigned int wb_offset, /* Offset & ~PAGE_CACHE_MASK */ |
42 | wb_pgbase, /* Start of page data */ | 41 | wb_pgbase, /* Start of page data */ |