diff options
author | Nick Piggin <npiggin@suse.de> | 2007-10-16 04:25:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:42:55 -0400 |
commit | 89e107877b65bf6eff1d63a1302dee9a091586f5 (patch) | |
tree | 8a120a04c46f19229d1cf9b9c546f1818cf84c44 /include | |
parent | 7765ec26ae1c01bb29bedf910e4efcced8cc81d2 (diff) |
fs: new cont helpers
Rework the generic block "cont" routines to handle the new aops. Supporting
cont_prepare_write would take quite a lot of code to support, so remove it
instead (and we later convert all filesystems to use it).
write_begin gets passed AOP_FLAG_CONT_EXPAND when called from
generic_cont_expand, so filesystems can avoid the old hacks they used.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/buffer_head.h | 5 | ||||
-rw-r--r-- | include/linux/fs.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index a562ecfb1a14..1caa71d4c95f 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h | |||
@@ -214,8 +214,9 @@ int generic_write_end(struct file *, struct address_space *, | |||
214 | struct page *, void *); | 214 | struct page *, void *); |
215 | void page_zero_new_buffers(struct page *page, unsigned from, unsigned to); | 215 | void page_zero_new_buffers(struct page *page, unsigned from, unsigned to); |
216 | int block_prepare_write(struct page*, unsigned, unsigned, get_block_t*); | 216 | int block_prepare_write(struct page*, unsigned, unsigned, get_block_t*); |
217 | int cont_prepare_write(struct page*, unsigned, unsigned, get_block_t*, | 217 | int cont_write_begin(struct file *, struct address_space *, loff_t, |
218 | loff_t *); | 218 | unsigned, unsigned, struct page **, void **, |
219 | get_block_t *, loff_t *); | ||
219 | int generic_cont_expand(struct inode *inode, loff_t size); | 220 | int generic_cont_expand(struct inode *inode, loff_t size); |
220 | int generic_cont_expand_simple(struct inode *inode, loff_t size); | 221 | int generic_cont_expand_simple(struct inode *inode, loff_t size); |
221 | int block_commit_write(struct page *page, unsigned from, unsigned to); | 222 | int block_commit_write(struct page *page, unsigned from, unsigned to); |
diff --git a/include/linux/fs.h b/include/linux/fs.h index e9344e6f877d..a40557eae2ed 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -395,6 +395,7 @@ enum positive_aop_returns { | |||
395 | }; | 395 | }; |
396 | 396 | ||
397 | #define AOP_FLAG_UNINTERRUPTIBLE 0x0001 /* will not do a short write */ | 397 | #define AOP_FLAG_UNINTERRUPTIBLE 0x0001 /* will not do a short write */ |
398 | #define AOP_FLAG_CONT_EXPAND 0x0002 /* called from cont_expand */ | ||
398 | 399 | ||
399 | /* | 400 | /* |
400 | * oh the beauties of C type declarations. | 401 | * oh the beauties of C type declarations. |