diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
commit | e6da74e1f20ea7822e52a9e4fbd3d25bd907e471 (patch) | |
tree | d9b3bc7e654fb788d1cf3a1759b1b3c74cc56a04 /fs/ext2/inode.c | |
parent | 1877c9ea66a29563987f22d0a86c66f438a87ce2 (diff) | |
parent | 3c3b809e256c417847f1a96b2f9d9f66c7fcb02c (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 | /* |