hfs: convert to new aops
Signed-off-by: Nick Piggin <npiggin@suse.de> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d7777a25a0
commit
7903d9eed8
|
@ -464,23 +464,20 @@ void hfs_file_truncate(struct inode *inode)
|
||||||
(long long)HFS_I(inode)->phys_size, inode->i_size);
|
(long long)HFS_I(inode)->phys_size, inode->i_size);
|
||||||
if (inode->i_size > HFS_I(inode)->phys_size) {
|
if (inode->i_size > HFS_I(inode)->phys_size) {
|
||||||
struct address_space *mapping = inode->i_mapping;
|
struct address_space *mapping = inode->i_mapping;
|
||||||
|
void *fsdata;
|
||||||
struct page *page;
|
struct page *page;
|
||||||
int res;
|
int res;
|
||||||
|
|
||||||
|
/* XXX: Can use generic_cont_expand? */
|
||||||
size = inode->i_size - 1;
|
size = inode->i_size - 1;
|
||||||
page = grab_cache_page(mapping, size >> PAGE_CACHE_SHIFT);
|
res = pagecache_write_begin(NULL, mapping, size+1, 0,
|
||||||
if (!page)
|
AOP_FLAG_UNINTERRUPTIBLE, &page, &fsdata);
|
||||||
return;
|
if (!res) {
|
||||||
size &= PAGE_CACHE_SIZE - 1;
|
res = pagecache_write_end(NULL, mapping, size+1, 0, 0,
|
||||||
size++;
|
page, fsdata);
|
||||||
res = mapping->a_ops->prepare_write(NULL, page, size, size);
|
}
|
||||||
if (!res)
|
|
||||||
res = mapping->a_ops->commit_write(NULL, page, size, size);
|
|
||||||
if (res)
|
if (res)
|
||||||
inode->i_size = HFS_I(inode)->phys_size;
|
inode->i_size = HFS_I(inode)->phys_size;
|
||||||
unlock_page(page);
|
|
||||||
page_cache_release(page);
|
|
||||||
mark_inode_dirty(inode);
|
|
||||||
return;
|
return;
|
||||||
} else if (inode->i_size == HFS_I(inode)->phys_size)
|
} else if (inode->i_size == HFS_I(inode)->phys_size)
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -35,10 +35,14 @@ static int hfs_readpage(struct file *file, struct page *page)
|
||||||
return block_read_full_page(page, hfs_get_block);
|
return block_read_full_page(page, hfs_get_block);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int hfs_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to)
|
static int hfs_write_begin(struct file *file, struct address_space *mapping,
|
||||||
|
loff_t pos, unsigned len, unsigned flags,
|
||||||
|
struct page **pagep, void **fsdata)
|
||||||
{
|
{
|
||||||
return cont_prepare_write(page, from, to, hfs_get_block,
|
*pagep = NULL;
|
||||||
&HFS_I(page->mapping->host)->phys_size);
|
return cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
|
||||||
|
hfs_get_block,
|
||||||
|
&HFS_I(mapping->host)->phys_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
static sector_t hfs_bmap(struct address_space *mapping, sector_t block)
|
static sector_t hfs_bmap(struct address_space *mapping, sector_t block)
|
||||||
|
@ -119,8 +123,8 @@ const struct address_space_operations hfs_btree_aops = {
|
||||||
.readpage = hfs_readpage,
|
.readpage = hfs_readpage,
|
||||||
.writepage = hfs_writepage,
|
.writepage = hfs_writepage,
|
||||||
.sync_page = block_sync_page,
|
.sync_page = block_sync_page,
|
||||||
.prepare_write = hfs_prepare_write,
|
.write_begin = hfs_write_begin,
|
||||||
.commit_write = generic_commit_write,
|
.write_end = generic_write_end,
|
||||||
.bmap = hfs_bmap,
|
.bmap = hfs_bmap,
|
||||||
.releasepage = hfs_releasepage,
|
.releasepage = hfs_releasepage,
|
||||||
};
|
};
|
||||||
|
@ -129,8 +133,8 @@ const struct address_space_operations hfs_aops = {
|
||||||
.readpage = hfs_readpage,
|
.readpage = hfs_readpage,
|
||||||
.writepage = hfs_writepage,
|
.writepage = hfs_writepage,
|
||||||
.sync_page = block_sync_page,
|
.sync_page = block_sync_page,
|
||||||
.prepare_write = hfs_prepare_write,
|
.write_begin = hfs_write_begin,
|
||||||
.commit_write = generic_commit_write,
|
.write_end = generic_write_end,
|
||||||
.bmap = hfs_bmap,
|
.bmap = hfs_bmap,
|
||||||
.direct_IO = hfs_direct_IO,
|
.direct_IO = hfs_direct_IO,
|
||||||
.writepages = hfs_writepages,
|
.writepages = hfs_writepages,
|
||||||
|
|
Loading…
Reference in a new issue