diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /fs/ext2/inode.c | |
parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (diff) |
Merge branch 'master'
Diffstat (limited to 'fs/ext2/inode.c')
-rw-r--r-- | fs/ext2/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index e7d3f0522d01..a717837f272e 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
@@ -706,6 +706,7 @@ struct address_space_operations ext2_aops = { | |||
706 | .bmap = ext2_bmap, | 706 | .bmap = ext2_bmap, |
707 | .direct_IO = ext2_direct_IO, | 707 | .direct_IO = ext2_direct_IO, |
708 | .writepages = ext2_writepages, | 708 | .writepages = ext2_writepages, |
709 | .migratepage = buffer_migrate_page, | ||
709 | }; | 710 | }; |
710 | 711 | ||
711 | struct address_space_operations ext2_aops_xip = { | 712 | struct address_space_operations ext2_aops_xip = { |
@@ -723,6 +724,7 @@ struct address_space_operations ext2_nobh_aops = { | |||
723 | .bmap = ext2_bmap, | 724 | .bmap = ext2_bmap, |
724 | .direct_IO = ext2_direct_IO, | 725 | .direct_IO = ext2_direct_IO, |
725 | .writepages = ext2_writepages, | 726 | .writepages = ext2_writepages, |
727 | .migratepage = buffer_migrate_page, | ||
726 | }; | 728 | }; |
727 | 729 | ||
728 | /* | 730 | /* |