Merge branch 'dell-wmi' into release

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / ext2 / inode.c

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 1c1638f873a4ac6d0d1e92179c76721ac2c55c4a..71b032c65a0220d6e9e6cea12d4621b61acca89b 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -137,7 +137,8 @@ static int ext2_block_to_path(struct inode *inode,
        int final = 0;
 
        if (i_block < 0) {
-               ext2_warning (inode->i_sb, "ext2_block_to_path", "block < 0");
+               ext2_msg(inode->i_sb, KERN_WARNING,
+                       "warning: %s: block < 0", __func__);
        } else if (i_block < direct_blocks) {
                offsets[n++] = i_block;
                final = direct_blocks;
@@ -157,7 +158,8 @@ static int ext2_block_to_path(struct inode *inode,
                offsets[n++] = i_block & (ptrs - 1);
                final = ptrs;
        } else {
-               ext2_warning (inode->i_sb, "ext2_block_to_path", "block > big");
+               ext2_msg(inode->i_sb, KERN_WARNING,
+                       "warning: %s: block is too big", __func__);
        }
        if (boundary)
                *boundary = final - 1 - (i_block & (ptrs - 1));
@@ -819,6 +821,7 @@ const struct address_space_operations ext2_aops = {
        .writepages             = ext2_writepages,
        .migratepage            = buffer_migrate_page,
        .is_partially_uptodate  = block_is_partially_uptodate,
+       .error_remove_page      = generic_error_remove_page,
 };
 
 const struct address_space_operations ext2_aops_xip = {
@@ -837,6 +840,7 @@ const struct address_space_operations ext2_nobh_aops = {
        .direct_IO              = ext2_direct_IO,
        .writepages             = ext2_writepages,
        .migratepage            = buffer_migrate_page,
+       .error_remove_page      = generic_error_remove_page,
 };
 
 /*