diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 02:58:35 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 02:58:35 -0500 |
| commit | 4c63f5646e405b5010cc9499419060bf2e838f5b (patch) | |
| tree | df91ba315032c8ec4aafeb3ab96fdfa7c6c656e1 /fs/minix | |
| parent | cafb0bfca1a73efd6d8a4a6a6a716e6134b96c24 (diff) | |
| parent | 69d60eb96ae8a73cf9b79cf28051caf973006011 (diff) | |
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
Conflicts:
block/blk-core.c
block/blk-flush.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
fs/nilfs2/btnode.c
fs/nilfs2/mdt.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
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) | |||
| 399 | static const struct address_space_operations minix_aops = { | 399 | static const struct address_space_operations minix_aops = { |
| 400 | .readpage = minix_readpage, | 400 | .readpage = minix_readpage, |
| 401 | .writepage = minix_writepage, | 401 | .writepage = minix_writepage, |
| 402 | .sync_page = block_sync_page, | ||
| 403 | .write_begin = minix_write_begin, | 402 | .write_begin = minix_write_begin, |
| 404 | .write_end = generic_write_end, | 403 | .write_end = generic_write_end, |
| 405 | .bmap = minix_bmap | 404 | .bmap = minix_bmap |