mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
72dac95d44
commit
03b40e3496
|
@ -912,7 +912,6 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,
|
||||||
struct page *pagep[2] = {NULL, NULL};
|
struct page *pagep[2] = {NULL, NULL};
|
||||||
handle_t *handle;
|
handle_t *handle;
|
||||||
ext4_lblk_t orig_blk_offset;
|
ext4_lblk_t orig_blk_offset;
|
||||||
long long offs = orig_page_offset << PAGE_CACHE_SHIFT;
|
|
||||||
unsigned long blocksize = orig_inode->i_sb->s_blocksize;
|
unsigned long blocksize = orig_inode->i_sb->s_blocksize;
|
||||||
unsigned int w_flags = 0;
|
unsigned int w_flags = 0;
|
||||||
unsigned int tmp_data_size, data_size, replaced_size;
|
unsigned int tmp_data_size, data_size, replaced_size;
|
||||||
|
@ -940,8 +939,6 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,
|
||||||
orig_blk_offset = orig_page_offset * blocks_per_page +
|
orig_blk_offset = orig_page_offset * blocks_per_page +
|
||||||
data_offset_in_page;
|
data_offset_in_page;
|
||||||
|
|
||||||
offs = (long long)orig_blk_offset << orig_inode->i_blkbits;
|
|
||||||
|
|
||||||
/* Calculate data_size */
|
/* Calculate data_size */
|
||||||
if ((orig_blk_offset + block_len_in_page - 1) ==
|
if ((orig_blk_offset + block_len_in_page - 1) ==
|
||||||
((orig_inode->i_size - 1) >> orig_inode->i_blkbits)) {
|
((orig_inode->i_size - 1) >> orig_inode->i_blkbits)) {
|
||||||
|
|
|
@ -1556,11 +1556,10 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input)
|
||||||
int reserved_gdb = ext4_bg_has_super(sb, input->group) ?
|
int reserved_gdb = ext4_bg_has_super(sb, input->group) ?
|
||||||
le16_to_cpu(es->s_reserved_gdt_blocks) : 0;
|
le16_to_cpu(es->s_reserved_gdt_blocks) : 0;
|
||||||
struct inode *inode = NULL;
|
struct inode *inode = NULL;
|
||||||
int gdb_off, gdb_num;
|
int gdb_off;
|
||||||
int err;
|
int err;
|
||||||
__u16 bg_flags = 0;
|
__u16 bg_flags = 0;
|
||||||
|
|
||||||
gdb_num = input->group / EXT4_DESC_PER_BLOCK(sb);
|
|
||||||
gdb_off = input->group % EXT4_DESC_PER_BLOCK(sb);
|
gdb_off = input->group % EXT4_DESC_PER_BLOCK(sb);
|
||||||
|
|
||||||
if (gdb_off == 0 && !EXT4_HAS_RO_COMPAT_FEATURE(sb,
|
if (gdb_off == 0 && !EXT4_HAS_RO_COMPAT_FEATURE(sb,
|
||||||
|
|
|
@ -1924,7 +1924,6 @@ static int ext4_fill_flex_info(struct super_block *sb)
|
||||||
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
||||||
struct ext4_group_desc *gdp = NULL;
|
struct ext4_group_desc *gdp = NULL;
|
||||||
ext4_group_t flex_group;
|
ext4_group_t flex_group;
|
||||||
unsigned int groups_per_flex = 0;
|
|
||||||
int i, err;
|
int i, err;
|
||||||
|
|
||||||
sbi->s_log_groups_per_flex = sbi->s_es->s_log_groups_per_flex;
|
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)
|
||||||
sbi->s_log_groups_per_flex = 0;
|
sbi->s_log_groups_per_flex = 0;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
groups_per_flex = 1U << sbi->s_log_groups_per_flex;
|
|
||||||
|
|
||||||
err = ext4_alloc_flex_bg_array(sb, sbi->s_groups_count);
|
err = ext4_alloc_flex_bg_array(sb, sbi->s_groups_count);
|
||||||
if (err)
|
if (err)
|
||||||
|
|
Loading…
Reference in New Issue