diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/ext3 | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 0321e1b9034a..f804d5e9d60c 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c | |||
| @@ -1698,7 +1698,7 @@ static int ext3_journalled_set_page_dirty(struct page *page) | |||
| 1698 | return __set_page_dirty_nobuffers(page); | 1698 | return __set_page_dirty_nobuffers(page); |
| 1699 | } | 1699 | } |
| 1700 | 1700 | ||
| 1701 | static struct address_space_operations ext3_ordered_aops = { | 1701 | static const struct address_space_operations ext3_ordered_aops = { |
| 1702 | .readpage = ext3_readpage, | 1702 | .readpage = ext3_readpage, |
| 1703 | .readpages = ext3_readpages, | 1703 | .readpages = ext3_readpages, |
| 1704 | .writepage = ext3_ordered_writepage, | 1704 | .writepage = ext3_ordered_writepage, |
| @@ -1712,7 +1712,7 @@ static struct address_space_operations ext3_ordered_aops = { | |||
| 1712 | .migratepage = buffer_migrate_page, | 1712 | .migratepage = buffer_migrate_page, |
| 1713 | }; | 1713 | }; |
| 1714 | 1714 | ||
| 1715 | static struct address_space_operations ext3_writeback_aops = { | 1715 | static const struct address_space_operations ext3_writeback_aops = { |
| 1716 | .readpage = ext3_readpage, | 1716 | .readpage = ext3_readpage, |
| 1717 | .readpages = ext3_readpages, | 1717 | .readpages = ext3_readpages, |
| 1718 | .writepage = ext3_writeback_writepage, | 1718 | .writepage = ext3_writeback_writepage, |
| @@ -1726,7 +1726,7 @@ static struct address_space_operations ext3_writeback_aops = { | |||
| 1726 | .migratepage = buffer_migrate_page, | 1726 | .migratepage = buffer_migrate_page, |
| 1727 | }; | 1727 | }; |
| 1728 | 1728 | ||
| 1729 | static struct address_space_operations ext3_journalled_aops = { | 1729 | static const struct address_space_operations ext3_journalled_aops = { |
| 1730 | .readpage = ext3_readpage, | 1730 | .readpage = ext3_readpage, |
| 1731 | .readpages = ext3_readpages, | 1731 | .readpages = ext3_readpages, |
| 1732 | .writepage = ext3_journalled_writepage, | 1732 | .writepage = ext3_journalled_writepage, |