aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ext4/ialloc.c1
-rw-r--r--fs/ext4/ioctl.c1
-rw-r--r--fs/ext4/mballoc.c2
-rw-r--r--fs/ext4/move_extent.c1
4 files changed, 0 insertions, 5 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index 6c5bb8d993fe..4c358f711cef 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -899,7 +899,6 @@ got:
899 if (EXT4_HAS_RO_COMPAT_FEATURE(sb, 899 if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
900 EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) { 900 EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
901 __u32 csum; 901 __u32 csum;
902 struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
903 __le32 inum = cpu_to_le32(inode->i_ino); 902 __le32 inum = cpu_to_le32(inode->i_ino);
904 __le32 gen = cpu_to_le32(inode->i_generation); 903 __le32 gen = cpu_to_le32(inode->i_generation);
905 csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&inum, 904 csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&inum,
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index cbc3acea6bcf..9491ac0590f7 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -552,7 +552,6 @@ group_add_out:
552 552
553 case EXT4_IOC_RESIZE_FS: { 553 case EXT4_IOC_RESIZE_FS: {
554 ext4_fsblk_t n_blocks_count; 554 ext4_fsblk_t n_blocks_count;
555 struct super_block *sb = inode->i_sb;
556 int err = 0, err2 = 0; 555 int err = 0, err2 = 0;
557 ext4_group_t o_group = EXT4_SB(sb)->s_groups_count; 556 ext4_group_t o_group = EXT4_SB(sb)->s_groups_count;
558 557
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 6a87f7217474..a11ea4d6164c 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -884,8 +884,6 @@ static int ext4_mb_init_cache(struct page *page, char *incore)
884 884
885 first_block = page->index * blocks_per_page; 885 first_block = page->index * blocks_per_page;
886 for (i = 0; i < blocks_per_page; i++) { 886 for (i = 0; i < blocks_per_page; i++) {
887 int group;
888
889 group = (first_block + i) >> 1; 887 group = (first_block + i) >> 1;
890 if (group >= ngroups) 888 if (group >= ngroups)
891 break; 889 break;
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index a2e696e16331..661f4ce688ec 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -858,7 +858,6 @@ mext_page_mkuptodate(struct page *page, unsigned from, unsigned to)
858 if (buffer_uptodate(bh)) 858 if (buffer_uptodate(bh))
859 continue; 859 continue;
860 if (!buffer_mapped(bh)) { 860 if (!buffer_mapped(bh)) {
861 int err = 0;
862 err = ext4_get_block(inode, block, bh, 0); 861 err = ext4_get_block(inode, block, bh, 0);
863 if (err) { 862 if (err) {
864 SetPageError(page); 863 SetPageError(page);