diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-24 12:17:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-24 12:17:12 -0400 |
| commit | d333fc8d3006296f2893d17817bc0f67cf87f353 (patch) | |
| tree | f759092ae962b0071e805e4526ffff57995d487b /include/linux | |
| parent | 1a93fa86bf6eb0d8bed84ef18c8b35be389edee5 (diff) | |
| parent | d4a8f3677fe2c2fc86443254fe42825e244c194d (diff) | |
Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
* 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6:
NFS: Fix nfs_direct_dirty_pages()
NFS: Fix handful of compiler warnings in direct.c
NFS: Avoid a deadlock situation on write
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nfs_page.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index 41afab6b5f09..bd193af80162 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h | |||
| @@ -81,6 +81,7 @@ extern void nfs_pageio_init(struct nfs_pageio_descriptor *desc, | |||
| 81 | extern int nfs_pageio_add_request(struct nfs_pageio_descriptor *, | 81 | extern int nfs_pageio_add_request(struct nfs_pageio_descriptor *, |
| 82 | struct nfs_page *); | 82 | struct nfs_page *); |
| 83 | extern void nfs_pageio_complete(struct nfs_pageio_descriptor *desc); | 83 | extern void nfs_pageio_complete(struct nfs_pageio_descriptor *desc); |
| 84 | extern void nfs_pageio_cond_complete(struct nfs_pageio_descriptor *, pgoff_t); | ||
| 84 | extern int nfs_wait_on_request(struct nfs_page *); | 85 | extern int nfs_wait_on_request(struct nfs_page *); |
| 85 | extern void nfs_unlock_request(struct nfs_page *req); | 86 | extern void nfs_unlock_request(struct nfs_page *req); |
| 86 | extern int nfs_set_page_writeback_locked(struct nfs_page *req); | 87 | extern int nfs_set_page_writeback_locked(struct nfs_page *req); |