smb3: improve parallel reads of large files

[tomoyo/tomoyo-test1.git] / fs / ext4 / ialloc.c

diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 1576630..787ab89 100644 (file)
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -98,7 +98,7 @@ static int ext4_validate_inode_bitmap(struct super_block *sb,
        if (buffer_verified(bh))
                goto verified;
        blk = ext4_inode_bitmap(sb, desc);
-       if (!ext4_inode_bitmap_csum_verify(sb, block_group, desc, bh,
+       if (!ext4_inode_bitmap_csum_verify(sb, desc, bh,
                                           EXT4_INODES_PER_GROUP(sb) / 8) ||
            ext4_simulate_fail(sb, EXT4_SIM_IBITMAP_CRC)) {
                ext4_unlock_group(sb, block_group);
@@ -327,7 +327,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
                if (percpu_counter_initialized(&sbi->s_dirs_counter))
                        percpu_counter_dec(&sbi->s_dirs_counter);
        }
-       ext4_inode_bitmap_csum_set(sb, block_group, gdp, bitmap_bh,
+       ext4_inode_bitmap_csum_set(sb, gdp, bitmap_bh,
                                   EXT4_INODES_PER_GROUP(sb) / 8);
        ext4_group_desc_csum_set(sb, block_group, gdp);
        ext4_unlock_group(sb, block_group);
@@ -813,8 +813,7 @@ int ext4_mark_inode_used(struct super_block *sb, int ino)
                        gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT);
                        ext4_free_group_clusters_set(sb, gdp,
                                ext4_free_clusters_after_init(sb, group, gdp));
-                       ext4_block_bitmap_csum_set(sb, group, gdp,
-                                                  block_bitmap_bh);
+                       ext4_block_bitmap_csum_set(sb, gdp, block_bitmap_bh);
                        ext4_group_desc_csum_set(sb, group, gdp);
                }
                ext4_unlock_group(sb, group);
@@ -852,7 +851,7 @@ int ext4_mark_inode_used(struct super_block *sb, int ino)
 
        ext4_free_inodes_set(sb, gdp, ext4_free_inodes_count(sb, gdp) - 1);
        if (ext4_has_group_desc_csum(sb)) {
-               ext4_inode_bitmap_csum_set(sb, group, gdp, inode_bitmap_bh,
+               ext4_inode_bitmap_csum_set(sb, gdp, inode_bitmap_bh,
                                           EXT4_INODES_PER_GROUP(sb) / 8);
                ext4_group_desc_csum_set(sb, group, gdp);
        }
@@ -1165,8 +1164,7 @@ got:
                        gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT);
                        ext4_free_group_clusters_set(sb, gdp,
                                ext4_free_clusters_after_init(sb, group, gdp));
-                       ext4_block_bitmap_csum_set(sb, group, gdp,
-                                                  block_bitmap_bh);
+                       ext4_block_bitmap_csum_set(sb, gdp, block_bitmap_bh);
                        ext4_group_desc_csum_set(sb, group, gdp);
                }
                ext4_unlock_group(sb, group);
@@ -1222,7 +1220,7 @@ got:
                }
        }
        if (ext4_has_group_desc_csum(sb)) {
-               ext4_inode_bitmap_csum_set(sb, group, gdp, inode_bitmap_bh,
+               ext4_inode_bitmap_csum_set(sb, gdp, inode_bitmap_bh,
                                           EXT4_INODES_PER_GROUP(sb) / 8);
                ext4_group_desc_csum_set(sb, group, gdp);
        }