diff options
author | Nick Piggin <npiggin@suse.de> | 2007-10-16 04:25:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:42:56 -0400 |
commit | d6091b720184c72909ef4dc4059b73bf68abea56 (patch) | |
tree | 75b6bee2f5d4c928687de680f0be5eb7ebac11e2 | |
parent | 7c0efc627738c840a685ea0f2c23d09aad7d5d3b (diff) |
hpfs: convert to new aops
Signed-off-by: Nick Piggin <npiggin@suse.de>
Cc: <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/hpfs/file.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index 5b53e5c5d8df..be8be5040e07 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c | |||
@@ -86,25 +86,33 @@ static int hpfs_writepage(struct page *page, struct writeback_control *wbc) | |||
86 | { | 86 | { |
87 | return block_write_full_page(page,hpfs_get_block, wbc); | 87 | return block_write_full_page(page,hpfs_get_block, wbc); |
88 | } | 88 | } |
89 | |||
89 | static int hpfs_readpage(struct file *file, struct page *page) | 90 | static int hpfs_readpage(struct file *file, struct page *page) |
90 | { | 91 | { |
91 | return block_read_full_page(page,hpfs_get_block); | 92 | return block_read_full_page(page,hpfs_get_block); |
92 | } | 93 | } |
93 | static int hpfs_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to) | 94 | |
95 | static int hpfs_write_begin(struct file *file, struct address_space *mapping, | ||
96 | loff_t pos, unsigned len, unsigned flags, | ||
97 | struct page **pagep, void **fsdata) | ||
94 | { | 98 | { |
95 | return cont_prepare_write(page,from,to,hpfs_get_block, | 99 | *pagep = NULL; |
96 | &hpfs_i(page->mapping->host)->mmu_private); | 100 | return cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata, |
101 | hpfs_get_block, | ||
102 | &hpfs_i(mapping->host)->mmu_private); | ||
97 | } | 103 | } |
104 | |||
98 | static sector_t _hpfs_bmap(struct address_space *mapping, sector_t block) | 105 | static sector_t _hpfs_bmap(struct address_space *mapping, sector_t block) |
99 | { | 106 | { |
100 | return generic_block_bmap(mapping,block,hpfs_get_block); | 107 | return generic_block_bmap(mapping,block,hpfs_get_block); |
101 | } | 108 | } |
109 | |||
102 | const struct address_space_operations hpfs_aops = { | 110 | const struct address_space_operations hpfs_aops = { |
103 | .readpage = hpfs_readpage, | 111 | .readpage = hpfs_readpage, |
104 | .writepage = hpfs_writepage, | 112 | .writepage = hpfs_writepage, |
105 | .sync_page = block_sync_page, | 113 | .sync_page = block_sync_page, |
106 | .prepare_write = hpfs_prepare_write, | 114 | .write_begin = hpfs_write_begin, |
107 | .commit_write = generic_commit_write, | 115 | .write_end = generic_write_end, |
108 | .bmap = _hpfs_bmap | 116 | .bmap = _hpfs_bmap |
109 | }; | 117 | }; |
110 | 118 | ||