diff options
author | Nick Piggin <npiggin@suse.de> | 2007-10-16 04:25:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:42:56 -0400 |
commit | eedcbba5e012978ec1bf972723aa02ab4df972e6 (patch) | |
tree | 6b31163962fb96fa58c5198777efd515db821788 | |
parent | d6091b720184c72909ef4dc4059b73bf68abea56 (diff) |
bfs: convert to new aops
Signed-off-by: Nick Piggin <npiggin@suse.de>
Cc: Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/bfs/file.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/bfs/file.c b/fs/bfs/file.c index 24310e9ee05a..911b4ccf470f 100644 --- a/fs/bfs/file.c +++ b/fs/bfs/file.c | |||
@@ -145,9 +145,13 @@ static int bfs_readpage(struct file *file, struct page *page) | |||
145 | return block_read_full_page(page, bfs_get_block); | 145 | return block_read_full_page(page, bfs_get_block); |
146 | } | 146 | } |
147 | 147 | ||
148 | static int bfs_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to) | 148 | static int bfs_write_begin(struct file *file, struct address_space *mapping, |
149 | loff_t pos, unsigned len, unsigned flags, | ||
150 | struct page **pagep, void **fsdata) | ||
149 | { | 151 | { |
150 | return block_prepare_write(page, from, to, bfs_get_block); | 152 | *pagep = NULL; |
153 | return block_write_begin(file, mapping, pos, len, flags, | ||
154 | pagep, fsdata, bfs_get_block); | ||
151 | } | 155 | } |
152 | 156 | ||
153 | static sector_t bfs_bmap(struct address_space *mapping, sector_t block) | 157 | static sector_t bfs_bmap(struct address_space *mapping, sector_t block) |
@@ -159,8 +163,8 @@ const struct address_space_operations bfs_aops = { | |||
159 | .readpage = bfs_readpage, | 163 | .readpage = bfs_readpage, |
160 | .writepage = bfs_writepage, | 164 | .writepage = bfs_writepage, |
161 | .sync_page = block_sync_page, | 165 | .sync_page = block_sync_page, |
162 | .prepare_write = bfs_prepare_write, | 166 | .write_begin = bfs_write_begin, |
163 | .commit_write = generic_commit_write, | 167 | .write_end = generic_write_end, |
164 | .bmap = bfs_bmap, | 168 | .bmap = bfs_bmap, |
165 | }; | 169 | }; |
166 | 170 | ||