diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-07 23:43:08 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 23:43:08 +0100 |
| commit | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (patch) | |
| tree | a3c34ad86ccdc904bb43af6cd1cb163231c29276 /fs/ext3 | |
| parent | [PATCH] PPC32 8xx: support for the physmapped flash on m8xx (diff) | |
| parent | [PATCH] powerpc: Lindent platforms/83xx (diff) | |
| download | linux-8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d.tar.xz linux-8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'fs/ext3')
| -rw-r--r-- | fs/ext3/acl.c | 2 | ||||
| -rw-r--r-- | fs/ext3/inode.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c index 47a9da2dfb4f..0d21d558b87a 100644 --- a/fs/ext3/acl.c +++ b/fs/ext3/acl.c @@ -226,7 +226,7 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type, struct ext3_inode_info *ei = EXT3_I(inode); int name_index; void *value = NULL; - size_t size; + size_t size = 0; int error; if (S_ISLNK(inode->i_mode)) diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 8824e84f8a56..3fc4238e9703 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -1559,6 +1559,7 @@ static struct address_space_operations ext3_ordered_aops = { .invalidatepage = ext3_invalidatepage, .releasepage = ext3_releasepage, .direct_IO = ext3_direct_IO, + .migratepage = buffer_migrate_page, }; static struct address_space_operations ext3_writeback_aops = { @@ -1572,6 +1573,7 @@ static struct address_space_operations ext3_writeback_aops = { .invalidatepage = ext3_invalidatepage, .releasepage = ext3_releasepage, .direct_IO = ext3_direct_IO, + .migratepage = buffer_migrate_page, }; static struct address_space_operations ext3_journalled_aops = { |