summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@imgtec.com>2016-09-30 08:14:56 +0200
committerTheodore Ts'o <tytso@mit.edu>2016-09-30 08:14:56 +0200
commit18017479cabaeb5c659d789f04ecf7939f8ee28f (patch)
tree3fd27cd302e51b1eee96feb8340a85705536526f
parentext4: use journal inode to determine journal overhead (diff)
downloadlinux-18017479cabaeb5c659d789f04ecf7939f8ee28f.tar.xz
linux-18017479cabaeb5c659d789f04ecf7939f8ee28f.zip
ext4: remove unused variable
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
-rw-r--r--fs/ext4/dir.c3
-rw-r--r--fs/ext4/page-io.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 4d4b91029109..e8b365000d73 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -628,7 +628,7 @@ int ext4_check_all_de(struct inode *dir, struct buffer_head *bh, void *buf,
int buf_size)
{
struct ext4_dir_entry_2 *de;
- int nlen, rlen;
+ int rlen;
unsigned int offset = 0;
char *top;
@@ -638,7 +638,6 @@ int ext4_check_all_de(struct inode *dir, struct buffer_head *bh, void *buf,
if (ext4_check_dir_entry(dir, NULL, de, bh,
buf, buf_size, offset))
return -EFSCORRUPTED;
- nlen = EXT4_DIR_REC_LEN(de->name_len);
rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
offset += rlen;
diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index a6132a730967..b4cbee936cf8 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -405,14 +405,12 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
{
struct page *data_page = NULL;
struct inode *inode = page->mapping->host;
- unsigned block_start, blocksize;
+ unsigned block_start;
struct buffer_head *bh, *head;
int ret = 0;
int nr_submitted = 0;
int nr_to_submit = 0;
- blocksize = 1 << inode->i_blkbits;
-
BUG_ON(!PageLocked(page));
BUG_ON(PageWriteback(page));