diff options
author | Christoph Hellwig <hch@lst.de> | 2005-06-24 01:00:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 03:05:19 -0400 |
commit | 92198f7eaa5df3479341dd8fa20c2c81aa3b1e25 (patch) | |
tree | b2b7f8c73b94b4179d5002eaaa30f683b6dc5132 /include/linux | |
parent | 16c29b67fb3bbacfc2a71f9e5f7d85728ef45efa (diff) |
[PATCH] pass iocb to dio_iodone_t
XFS will have to look at iocb->private to fix aio+dio. No other filesystem
is using the blockdev_direct_IO* end_io callback.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 517bf4966bf5..83857d8070d3 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -220,6 +220,7 @@ extern int dir_notify_enable; | |||
220 | 220 | ||
221 | struct iovec; | 221 | struct iovec; |
222 | struct nameidata; | 222 | struct nameidata; |
223 | struct kiocb; | ||
223 | struct pipe_inode_info; | 224 | struct pipe_inode_info; |
224 | struct poll_table_struct; | 225 | struct poll_table_struct; |
225 | struct kstatfs; | 226 | struct kstatfs; |
@@ -240,7 +241,7 @@ typedef int (get_block_t)(struct inode *inode, sector_t iblock, | |||
240 | typedef int (get_blocks_t)(struct inode *inode, sector_t iblock, | 241 | typedef int (get_blocks_t)(struct inode *inode, sector_t iblock, |
241 | unsigned long max_blocks, | 242 | unsigned long max_blocks, |
242 | struct buffer_head *bh_result, int create); | 243 | struct buffer_head *bh_result, int create); |
243 | typedef void (dio_iodone_t)(struct inode *inode, loff_t offset, | 244 | typedef void (dio_iodone_t)(struct kiocb *iocb, loff_t offset, |
244 | ssize_t bytes, void *private); | 245 | ssize_t bytes, void *private); |
245 | 246 | ||
246 | /* | 247 | /* |
@@ -302,7 +303,6 @@ struct iattr { | |||
302 | struct page; | 303 | struct page; |
303 | struct address_space; | 304 | struct address_space; |
304 | struct writeback_control; | 305 | struct writeback_control; |
305 | struct kiocb; | ||
306 | 306 | ||
307 | struct address_space_operations { | 307 | struct address_space_operations { |
308 | int (*writepage)(struct page *page, struct writeback_control *wbc); | 308 | int (*writepage)(struct page *page, struct writeback_control *wbc); |