diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-22 12:59:49 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-22 12:59:49 +1100 |
| commit | 36957000ef945a2c3945e484ee5e6b1763e55ecf (patch) | |
| tree | 221e947ccf6f16fb6862649348dd58bfa1367838 /fs/adfs | |
| parent | 387d5967e2e983da3b00ae2338d8575b88224f0c (diff) | |
| parent | c87def4ce046942c8965f14efa696e0dee528598 (diff) | |
Merge remote-tracking branch 'block/for-next'
Conflicts:
fs/aio.c
fs/super.c
Diffstat (limited to 'fs/adfs')
| -rw-r--r-- | fs/adfs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c index 09fe40198d1c..766e26716a5d 100644 --- a/fs/adfs/inode.c +++ b/fs/adfs/inode.c @@ -72,7 +72,6 @@ static sector_t _adfs_bmap(struct address_space *mapping, sector_t block) static const struct address_space_operations adfs_aops = { .readpage = adfs_readpage, .writepage = adfs_writepage, - .sync_page = block_sync_page, .write_begin = adfs_write_begin, .write_end = generic_write_end, .bmap = _adfs_bmap |