Commit d7777a25 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds

fat: convert to new aops

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 89e10787
...@@ -141,19 +141,24 @@ static int fat_readpages(struct file *file, struct address_space *mapping, ...@@ -141,19 +141,24 @@ static int fat_readpages(struct file *file, struct address_space *mapping,
return mpage_readpages(mapping, pages, nr_pages, fat_get_block); return mpage_readpages(mapping, pages, nr_pages, fat_get_block);
} }
static int fat_prepare_write(struct file *file, struct page *page, static int fat_write_begin(struct file *file, struct address_space *mapping,
unsigned from, unsigned to) loff_t pos, unsigned len, unsigned flags,
struct page **pagep, void **fsdata)
{ {
return cont_prepare_write(page, from, to, fat_get_block, *pagep = NULL;
&MSDOS_I(page->mapping->host)->mmu_private); return cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
fat_get_block,
&MSDOS_I(mapping->host)->mmu_private);
} }
static int fat_commit_write(struct file *file, struct page *page, static int fat_write_end(struct file *file, struct address_space *mapping,
unsigned from, unsigned to) loff_t pos, unsigned len, unsigned copied,
struct page *pagep, void *fsdata)
{ {
struct inode *inode = page->mapping->host; struct inode *inode = mapping->host;
int err = generic_commit_write(file, page, from, to); int err;
if (!err && !(MSDOS_I(inode)->i_attrs & ATTR_ARCH)) { err = generic_write_end(file, mapping, pos, len, copied, pagep, fsdata);
if (!(err < 0) && !(MSDOS_I(inode)->i_attrs & ATTR_ARCH)) {
inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC; inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
MSDOS_I(inode)->i_attrs |= ATTR_ARCH; MSDOS_I(inode)->i_attrs |= ATTR_ARCH;
mark_inode_dirty(inode); mark_inode_dirty(inode);
...@@ -202,8 +207,8 @@ static const struct address_space_operations fat_aops = { ...@@ -202,8 +207,8 @@ static const struct address_space_operations fat_aops = {
.writepage = fat_writepage, .writepage = fat_writepage,
.writepages = fat_writepages, .writepages = fat_writepages,
.sync_page = block_sync_page, .sync_page = block_sync_page,
.prepare_write = fat_prepare_write, .write_begin = fat_write_begin,
.commit_write = fat_commit_write, .write_end = fat_write_end,
.direct_IO = fat_direct_IO, .direct_IO = fat_direct_IO,
.bmap = _fat_bmap .bmap = _fat_bmap
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment