lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hfsplus: convert to new aops

Browse Source 
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:
Nick Piggin
2007-10-16 01:25:09 -07:00
committed by Linus Torvalds
parent 7903d9eed8
commit 7c0efc6277
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/hfsplus/extents.c
View File

@@ -443,21 +443,18 @@ void hfsplus_file_truncate(struct inode *inode)
if (inode->i_size > HFSPLUS_I(inode).phys_size) { if (inode->i_size > HFSPLUS_I(inode).phys_size) {
struct address_space *mapping = inode->i_mapping; struct address_space *mapping = inode->i_mapping;
struct page *page; struct page *page;
u32 size = inode->i_size - 1; void *fsdata;
u32 size = inode->i_size;
int res; int res;
page = grab_cache_page(mapping, size >> PAGE_CACHE_SHIFT); res = pagecache_write_begin(NULL, mapping, size, 0,
if (!page) AOP_FLAG_UNINTERRUPTIBLE,
return; &page, &fsdata);
size &= PAGE_CACHE_SIZE - 1;
size++;
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 = HFSPLUS_I(inode).phys_size; return;
unlock_page(page); res = pagecache_write_end(NULL, mapping, size, 0, 0, page, fsdata);
page_cache_release(page); if (res < 0)
return;
mark_inode_dirty(inode); mark_inode_dirty(inode);
return; return;
} else if (inode->i_size == HFSPLUS_I(inode).phys_size) } else if (inode->i_size == HFSPLUS_I(inode).phys_size)

18
fs/hfsplus/inode.c
View File

@@ -27,10 +27,14 @@ static int hfsplus_writepage(struct page *page, struct writeback_control *wbc)
return block_write_full_page(page, hfsplus_get_block, wbc); return block_write_full_page(page, hfsplus_get_block, wbc);
} }
static int hfsplus_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to) static int hfsplus_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, hfsplus_get_block, *pagep = NULL;
&HFSPLUS_I(page->mapping->host).phys_size); return cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
hfsplus_get_block,
&HFSPLUS_I(mapping->host).phys_size);
} }
static sector_t hfsplus_bmap(struct address_space *mapping, sector_t block) static sector_t hfsplus_bmap(struct address_space *mapping, sector_t block)
@@ -114,8 +118,8 @@ const struct address_space_operations hfsplus_btree_aops = {
.readpage = hfsplus_readpage, .readpage = hfsplus_readpage,
.writepage = hfsplus_writepage, .writepage = hfsplus_writepage,
.sync_page = block_sync_page, .sync_page = block_sync_page,
.prepare_write = hfsplus_prepare_write, .write_begin = hfsplus_write_begin,
.commit_write = generic_commit_write, .write_end = generic_write_end,
.bmap = hfsplus_bmap, .bmap = hfsplus_bmap,
.releasepage = hfsplus_releasepage, .releasepage = hfsplus_releasepage,
}; };
@@ -124,8 +128,8 @@ const struct address_space_operations hfsplus_aops = {
.readpage = hfsplus_readpage, .readpage = hfsplus_readpage,
.writepage = hfsplus_writepage, .writepage = hfsplus_writepage,
.sync_page = block_sync_page, .sync_page = block_sync_page,
.prepare_write = hfsplus_prepare_write, .write_begin = hfsplus_write_begin,
.commit_write = generic_commit_write, .write_end = generic_write_end,
.bmap = hfsplus_bmap, .bmap = hfsplus_bmap,
.direct_IO = hfsplus_direct_IO, .direct_IO = hfsplus_direct_IO,
.writepages = hfsplus_writepages, .writepages = hfsplus_writepages,