diff options
Diffstat (limited to 'fs/ext4/ext4.h')
-rw-r--r-- | fs/ext4/ext4.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 0ccda0c9682e..d93393eb5f2d 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -194,8 +194,7 @@ struct mpage_da_data { | |||
194 | */ | 194 | */ |
195 | #define EXT4_IO_END_UNWRITTEN 0x0001 | 195 | #define EXT4_IO_END_UNWRITTEN 0x0001 |
196 | #define EXT4_IO_END_ERROR 0x0002 | 196 | #define EXT4_IO_END_ERROR 0x0002 |
197 | #define EXT4_IO_END_QUEUED 0x0004 | 197 | #define EXT4_IO_END_DIRECT 0x0004 |
198 | #define EXT4_IO_END_DIRECT 0x0008 | ||
199 | 198 | ||
200 | struct ext4_io_page { | 199 | struct ext4_io_page { |
201 | struct page *p_page; | 200 | struct page *p_page; |
@@ -217,7 +216,6 @@ typedef struct ext4_io_end { | |||
217 | unsigned int flag; /* unwritten or not */ | 216 | unsigned int flag; /* unwritten or not */ |
218 | loff_t offset; /* offset in the file */ | 217 | loff_t offset; /* offset in the file */ |
219 | ssize_t size; /* size of the extent */ | 218 | ssize_t size; /* size of the extent */ |
220 | struct work_struct work; /* data work queue */ | ||
221 | struct kiocb *iocb; /* iocb struct for AIO */ | 219 | struct kiocb *iocb; /* iocb struct for AIO */ |
222 | int result; /* error value for AIO */ | 220 | int result; /* error value for AIO */ |
223 | int num_io_pages; /* for writepages() */ | 221 | int num_io_pages; /* for writepages() */ |
@@ -929,6 +927,7 @@ struct ext4_inode_info { | |||
929 | spinlock_t i_completed_io_lock; | 927 | spinlock_t i_completed_io_lock; |
930 | atomic_t i_ioend_count; /* Number of outstanding io_end structs */ | 928 | atomic_t i_ioend_count; /* Number of outstanding io_end structs */ |
931 | atomic_t i_unwritten; /* Nr. of inflight conversions pending */ | 929 | atomic_t i_unwritten; /* Nr. of inflight conversions pending */ |
930 | struct work_struct i_unwritten_work; /* deferred extent conversion */ | ||
932 | 931 | ||
933 | spinlock_t i_block_reservation_lock; | 932 | spinlock_t i_block_reservation_lock; |
934 | 933 | ||
@@ -2538,6 +2537,7 @@ extern void ext4_exit_pageio(void); | |||
2538 | extern void ext4_ioend_wait(struct inode *); | 2537 | extern void ext4_ioend_wait(struct inode *); |
2539 | extern void ext4_free_io_end(ext4_io_end_t *io); | 2538 | extern void ext4_free_io_end(ext4_io_end_t *io); |
2540 | extern ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags); | 2539 | extern ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags); |
2540 | extern void ext4_end_io_work(struct work_struct *work); | ||
2541 | extern void ext4_io_submit(struct ext4_io_submit *io); | 2541 | extern void ext4_io_submit(struct ext4_io_submit *io); |
2542 | extern int ext4_bio_write_page(struct ext4_io_submit *io, | 2542 | extern int ext4_bio_write_page(struct ext4_io_submit *io, |
2543 | struct page *page, | 2543 | struct page *page, |