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/udf/file.c | |
| 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/udf/file.c')
| -rw-r--r-- | fs/udf/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c index 89c78486cbbe..94e4553491c9 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c | |||
| @@ -98,7 +98,6 @@ static int udf_adinicb_write_end(struct file *file, | |||
| 98 | const struct address_space_operations udf_adinicb_aops = { | 98 | const struct address_space_operations udf_adinicb_aops = { |
| 99 | .readpage = udf_adinicb_readpage, | 99 | .readpage = udf_adinicb_readpage, |
| 100 | .writepage = udf_adinicb_writepage, | 100 | .writepage = udf_adinicb_writepage, |
| 101 | .sync_page = block_sync_page, | ||
| 102 | .write_begin = simple_write_begin, | 101 | .write_begin = simple_write_begin, |
| 103 | .write_end = udf_adinicb_write_end, | 102 | .write_end = udf_adinicb_write_end, |
| 104 | }; | 103 | }; |