Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b4585729f0b616c95aacafb8c8cb5e1af0d4242f

Authored by Nick Piggin
Committed by Linus Torvalds
1 parent d5c5f84ba9

fs: adfs convert to new aops 

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 9 additions and 5 deletions Side-by-side Diff

... ... @@ -61,10 +61,14 @@
61 61 return block_read_full_page(page, adfs_get_block);
62 62 }
63 63  
64   -static int adfs_prepare_write(struct file *file, struct page *page, unsigned int from, unsigned int to)
  64 +static int adfs_write_begin(struct file *file, struct address_space *mapping,
  65 + loff_t pos, unsigned len, unsigned flags,
  66 + struct page **pagep, void **fsdata)
65 67 {
66   - return cont_prepare_write(page, from, to, adfs_get_block,
67   - &ADFS_I(page->mapping->host)->mmu_private);
  68 + *pagep = NULL;
  69 + return cont_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
  70 + adfs_get_block,
  71 + &ADFS_I(mapping->host)->mmu_private);
68 72 }
69 73  
70 74 static sector_t _adfs_bmap(struct address_space *mapping, sector_t block)
... ... @@ -76,8 +80,8 @@
76 80 .readpage = adfs_readpage,
77 81 .writepage = adfs_writepage,
78 82 .sync_page = block_sync_page,
79   - .prepare_write = adfs_prepare_write,
80   - .commit_write = generic_commit_write,
  83 + .write_begin = adfs_write_begin,
  84 + .write_end = generic_write_end,
81 85 .bmap = _adfs_bmap
82 86 };
83 87