diff options
author | Jon Ernst <jonernst07@gmx.com> | 2013-06-17 08:56:26 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2013-06-17 08:56:26 -0400 |
commit | 03b40e349695dc700582568e5b410a89058f707e (patch) | |
tree | 0b029fd2f30b33f0fcdc0a68b4941fb7b1531cdd /fs/ext4 | |
parent | 72dac95d4403ee7231e094e1735ecb96032e6117 (diff) |
ext4: delete unused variables
This patch removed several unused variables.
Signed-off-by: Jon Ernst <jonernst07@gmx.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/move_extent.c | 3 | ||||
-rw-r--r-- | fs/ext4/resize.c | 3 | ||||
-rw-r--r-- | fs/ext4/super.c | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index 3dcbf364022f..e86dddbd8296 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c | |||
@@ -912,7 +912,6 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, | |||
912 | struct page *pagep[2] = {NULL, NULL}; | 912 | struct page *pagep[2] = {NULL, NULL}; |
913 | handle_t *handle; | 913 | handle_t *handle; |
914 | ext4_lblk_t orig_blk_offset; | 914 | ext4_lblk_t orig_blk_offset; |
915 | long long offs = orig_page_offset << PAGE_CACHE_SHIFT; | ||
916 | unsigned long blocksize = orig_inode->i_sb->s_blocksize; | 915 | unsigned long blocksize = orig_inode->i_sb->s_blocksize; |
917 | unsigned int w_flags = 0; | 916 | unsigned int w_flags = 0; |
918 | unsigned int tmp_data_size, data_size, replaced_size; | 917 | unsigned int tmp_data_size, data_size, replaced_size; |
@@ -940,8 +939,6 @@ again: | |||
940 | orig_blk_offset = orig_page_offset * blocks_per_page + | 939 | orig_blk_offset = orig_page_offset * blocks_per_page + |
941 | data_offset_in_page; | 940 | data_offset_in_page; |
942 | 941 | ||
943 | offs = (long long)orig_blk_offset << orig_inode->i_blkbits; | ||
944 | |||
945 | /* Calculate data_size */ | 942 | /* Calculate data_size */ |
946 | if ((orig_blk_offset + block_len_in_page - 1) == | 943 | if ((orig_blk_offset + block_len_in_page - 1) == |
947 | ((orig_inode->i_size - 1) >> orig_inode->i_blkbits)) { | 944 | ((orig_inode->i_size - 1) >> orig_inode->i_blkbits)) { |
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 6ed4df27da8d..707095b924d9 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c | |||
@@ -1556,11 +1556,10 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input) | |||
1556 | int reserved_gdb = ext4_bg_has_super(sb, input->group) ? | 1556 | int reserved_gdb = ext4_bg_has_super(sb, input->group) ? |
1557 | le16_to_cpu(es->s_reserved_gdt_blocks) : 0; | 1557 | le16_to_cpu(es->s_reserved_gdt_blocks) : 0; |
1558 | struct inode *inode = NULL; | 1558 | struct inode *inode = NULL; |
1559 | int gdb_off, gdb_num; | 1559 | int gdb_off; |
1560 | int err; | 1560 | int err; |
1561 | __u16 bg_flags = 0; | 1561 | __u16 bg_flags = 0; |
1562 | 1562 | ||
1563 | gdb_num = input->group / EXT4_DESC_PER_BLOCK(sb); | ||
1564 | gdb_off = input->group % EXT4_DESC_PER_BLOCK(sb); | 1563 | gdb_off = input->group % EXT4_DESC_PER_BLOCK(sb); |
1565 | 1564 | ||
1566 | if (gdb_off == 0 && !EXT4_HAS_RO_COMPAT_FEATURE(sb, | 1565 | if (gdb_off == 0 && !EXT4_HAS_RO_COMPAT_FEATURE(sb, |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index eb52a7be1fc1..54701fca4515 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1924,7 +1924,6 @@ static int ext4_fill_flex_info(struct super_block *sb) | |||
1924 | struct ext4_sb_info *sbi = EXT4_SB(sb); | 1924 | struct ext4_sb_info *sbi = EXT4_SB(sb); |
1925 | struct ext4_group_desc *gdp = NULL; | 1925 | struct ext4_group_desc *gdp = NULL; |
1926 | ext4_group_t flex_group; | 1926 | ext4_group_t flex_group; |
1927 | unsigned int groups_per_flex = 0; | ||
1928 | int i, err; | 1927 | int i, err; |
1929 | 1928 | ||
1930 | sbi->s_log_groups_per_flex = sbi->s_es->s_log_groups_per_flex; | 1929 | sbi->s_log_groups_per_flex = sbi->s_es->s_log_groups_per_flex; |
@@ -1932,7 +1931,6 @@ static int ext4_fill_flex_info(struct super_block *sb) | |||
1932 | sbi->s_log_groups_per_flex = 0; | 1931 | sbi->s_log_groups_per_flex = 0; |
1933 | return 1; | 1932 | return 1; |
1934 | } | 1933 | } |
1935 | groups_per_flex = 1U << sbi->s_log_groups_per_flex; | ||
1936 | 1934 | ||
1937 | err = ext4_alloc_flex_bg_array(sb, sbi->s_groups_count); | 1935 | err = ext4_alloc_flex_bg_array(sb, sbi->s_groups_count); |
1938 | if (err) | 1936 | if (err) |