diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 10:52:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 10:52:58 -0400 |
| commit | 1788c208aab15f9d9d1d24cff0d0c64b5c73bbee (patch) | |
| tree | faf11b0fe60042af282a57f339031728dda28594 /include | |
| parent | 15b7cf1416c0e3ae6163ade3349d717fe2729952 (diff) | |
| parent | a271c5a0dea418931b6a903ef85adc30ad4c54be (diff) | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: Ensure that rpc_release_resources_task() can be called twice.
NFS: Don't leak RPC clients in NFSv4 secinfo negotiation
NFS: Fix a hang in the writeback path
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfs_page.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index 8023e4e25133..91af2e49fa3a 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h | |||
| @@ -78,7 +78,6 @@ extern struct nfs_page *nfs_create_request(struct nfs_open_context *ctx, | |||
| 78 | struct page *page, | 78 | struct page *page, |
| 79 | unsigned int offset, | 79 | unsigned int offset, |
| 80 | unsigned int count); | 80 | unsigned int count); |
| 81 | extern void nfs_clear_request(struct nfs_page *req); | ||
| 82 | extern void nfs_release_request(struct nfs_page *req); | 81 | extern void nfs_release_request(struct nfs_page *req); |
| 83 | 82 | ||
| 84 | 83 | ||