aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjon ernst <jonernst07@gmail.com>2014-01-11 13:26:56 -0500
committerTheodore Ts'o <tytso@mit.edu>2014-01-11 13:26:56 -0500
commitd7092ae2973f20a39fee786c47e5edf18ced088f (patch)
tree270ee65e620c32aa0041ce6ac5776f60a6e8ffb0
parent8c9367fd9bf252b57c6d4f8e1a7f9de809d8b862 (diff)
ext4: delete "set but not used" variables
Signed-off-by: Jon Ernst <jonernst07@gmail.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>
-rw-r--r--fs/ext4/inline.c2
-rw-r--r--fs/ext4/ioctl.c6
2 files changed, 1 insertions, 7 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index ed29e720e880..82edf5b93352 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1841,7 +1841,6 @@ int ext4_try_to_evict_inline_data(handle_t *handle,
1841{ 1841{
1842 int error; 1842 int error;
1843 struct ext4_xattr_entry *entry; 1843 struct ext4_xattr_entry *entry;
1844 struct ext4_xattr_ibody_header *header;
1845 struct ext4_inode *raw_inode; 1844 struct ext4_inode *raw_inode;
1846 struct ext4_iloc iloc; 1845 struct ext4_iloc iloc;
1847 1846
@@ -1850,7 +1849,6 @@ int ext4_try_to_evict_inline_data(handle_t *handle,
1850 return error; 1849 return error;
1851 1850
1852 raw_inode = ext4_raw_inode(&iloc); 1851 raw_inode = ext4_raw_inode(&iloc);
1853 header = IHDR(inode, raw_inode);
1854 entry = (struct ext4_xattr_entry *)((void *)raw_inode + 1852 entry = (struct ext4_xattr_entry *)((void *)raw_inode +
1855 EXT4_I(inode)->i_inline_off); 1853 EXT4_I(inode)->i_inline_off);
1856 if (EXT4_XATTR_LEN(entry->e_name_len) + 1854 if (EXT4_XATTR_LEN(entry->e_name_len) +
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 60589b60e9b0..6bea80614d77 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -101,9 +101,8 @@ static long swap_inode_boot_loader(struct super_block *sb,
101 handle_t *handle; 101 handle_t *handle;
102 int err; 102 int err;
103 struct inode *inode_bl; 103 struct inode *inode_bl;
104 struct ext4_inode_info *ei;
105 struct ext4_inode_info *ei_bl; 104 struct ext4_inode_info *ei_bl;
106 struct ext4_sb_info *sbi; 105 struct ext4_sb_info *sbi = EXT4_SB(sb);
107 106
108 if (inode->i_nlink != 1 || !S_ISREG(inode->i_mode)) { 107 if (inode->i_nlink != 1 || !S_ISREG(inode->i_mode)) {
109 err = -EINVAL; 108 err = -EINVAL;
@@ -115,9 +114,6 @@ static long swap_inode_boot_loader(struct super_block *sb,
115 goto swap_boot_out; 114 goto swap_boot_out;
116 } 115 }
117 116
118 sbi = EXT4_SB(sb);
119 ei = EXT4_I(inode);
120
121 inode_bl = ext4_iget(sb, EXT4_BOOT_LOADER_INO); 117 inode_bl = ext4_iget(sb, EXT4_BOOT_LOADER_INO);
122 if (IS_ERR(inode_bl)) { 118 if (IS_ERR(inode_bl)) {
123 err = PTR_ERR(inode_bl); 119 err = PTR_ERR(inode_bl);