aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@imgtec.com>2016-09-30 02:14:56 -0400
committerTheodore Ts'o <tytso@mit.edu>2016-09-30 02:14:56 -0400
commit18017479cabaeb5c659d789f04ecf7939f8ee28f (patch)
tree3fd27cd302e51b1eee96feb8340a85705536526f
parent3c816ded78bbd645d61ee36f461deb8376d3723a (diff)
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,
628 int buf_size) 628 int buf_size)
629{ 629{
630 struct ext4_dir_entry_2 *de; 630 struct ext4_dir_entry_2 *de;
631 int nlen, rlen; 631 int rlen;
632 unsigned int offset = 0; 632 unsigned int offset = 0;
633 char *top; 633 char *top;
634 634
@@ -638,7 +638,6 @@ int ext4_check_all_de(struct inode *dir, struct buffer_head *bh, void *buf,
638 if (ext4_check_dir_entry(dir, NULL, de, bh, 638 if (ext4_check_dir_entry(dir, NULL, de, bh,
639 buf, buf_size, offset)) 639 buf, buf_size, offset))
640 return -EFSCORRUPTED; 640 return -EFSCORRUPTED;
641 nlen = EXT4_DIR_REC_LEN(de->name_len);
642 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size); 641 rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);
643 de = (struct ext4_dir_entry_2 *)((char *)de + rlen); 642 de = (struct ext4_dir_entry_2 *)((char *)de + rlen);
644 offset += rlen; 643 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,
405{ 405{
406 struct page *data_page = NULL; 406 struct page *data_page = NULL;
407 struct inode *inode = page->mapping->host; 407 struct inode *inode = page->mapping->host;
408 unsigned block_start, blocksize; 408 unsigned block_start;
409 struct buffer_head *bh, *head; 409 struct buffer_head *bh, *head;
410 int ret = 0; 410 int ret = 0;
411 int nr_submitted = 0; 411 int nr_submitted = 0;
412 int nr_to_submit = 0; 412 int nr_to_submit = 0;
413 413
414 blocksize = 1 << inode->i_blkbits;
415
416 BUG_ON(!PageLocked(page)); 414 BUG_ON(!PageLocked(page));
417 BUG_ON(PageWriteback(page)); 415 BUG_ON(PageWriteback(page));
418 416