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/isofs | |
| 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/isofs')
| -rw-r--r-- | fs/isofs/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index a0f3833c0dbf..3db5ba4568fc 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
| @@ -1158,7 +1158,6 @@ static sector_t _isofs_bmap(struct address_space *mapping, sector_t block) | |||
| 1158 | 1158 | ||
| 1159 | static const struct address_space_operations isofs_aops = { | 1159 | static const struct address_space_operations isofs_aops = { |
| 1160 | .readpage = isofs_readpage, | 1160 | .readpage = isofs_readpage, |
| 1161 | .sync_page = block_sync_page, | ||
| 1162 | .bmap = _isofs_bmap | 1161 | .bmap = _isofs_bmap |
| 1163 | }; | 1162 | }; |
| 1164 | 1163 | ||