diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-21 11:29:29 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-21 11:29:29 +1100 |
| commit | d9f45ac3d11e8f6354da08785919344d73a99ef4 (patch) | |
| tree | 49a3b4ca6d2093114f0ad8cafa42123ac64d14d3 /fs/minix | |
| parent | 904433b151c8ec5cf5c75313c524642e98493fd7 (diff) | |
| parent | 8f6691cf93a3f758d5fe88eba928b0eaec92fb8e (diff) | |
Merge remote-tracking branch 'block/for-next'
Conflicts:
fs/aio.c
fs/super.c
Diffstat (limited to 'fs/minix')
| -rw-r--r-- | fs/minix/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index ae0b83f476a6..adcdc0a4e182 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -399,7 +399,6 @@ static sector_t minix_bmap(struct address_space *mapping, sector_t block) static const struct address_space_operations minix_aops = { .readpage = minix_readpage, .writepage = minix_writepage, - .sync_page = block_sync_page, .write_begin = minix_write_begin, .write_end = generic_write_end, .bmap = minix_bmap |