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/adfs | |
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/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 65794b8fe79e..1cc84b276131 100644 --- a/fs/adfs/inode.c +++ b/fs/adfs/inode.c | |||
@@ -73,7 +73,6 @@ static sector_t _adfs_bmap(struct address_space *mapping, sector_t block) | |||
73 | static const struct address_space_operations adfs_aops = { | 73 | static const struct address_space_operations adfs_aops = { |
74 | .readpage = adfs_readpage, | 74 | .readpage = adfs_readpage, |
75 | .writepage = adfs_writepage, | 75 | .writepage = adfs_writepage, |
76 | .sync_page = block_sync_page, | ||
77 | .write_begin = adfs_write_begin, | 76 | .write_begin = adfs_write_begin, |
78 | .write_end = generic_write_end, | 77 | .write_end = generic_write_end, |
79 | .bmap = _adfs_bmap | 78 | .bmap = _adfs_bmap |