foo.diff

diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index 3c382b5..d0b8f98 100644
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -113,15 +113,6 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,
 		if (WARN_ON_ONCE(err)) {
 			ext4_journal_abort_handle(where, line, __func__, bh,
 						  handle, err);
-			ext4_error_inode(inode, where, line,
-					 bh->b_blocknr,
-					 "journal_dirty_metadata failed: "
-					 "handle type %u started at line %u, "
-					 "credits %u/%u, errcode %d",
-					 handle->h_type,
-					 handle->h_line_no,
-					 handle->h_requested_credits,
-					 handle->h_buffer_credits, err);
 		}
 	} else {
 		if (inode)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 5b95e18..4296a6f 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -2111,7 +2111,7 @@ static int
 ext4_ext_in_cache(struct inode *inode, ext4_lblk_t block,
 			struct ext4_extent *ex)
 {
-	struct ext4_ext_cache cex = {0, 0, 0};
+	struct ext4_ext_cache cex;
 	int ret = 0;
 
 	if (ext4_ext_check_cache(inode, block, &cex)) {
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 282d6f9..9727522 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -123,7 +123,6 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 			else
 				ext4_clear_inode_flag(inode, i);
 		}
-		ei->i_flags = flags;
 
 		ext4_set_inode_flags(inode);
 		inode->i_ctime = ext4_current_time(inode);
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 2609b45..f0e4e46 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -658,14 +658,6 @@ void __ext4_abort(struct super_block *sb, const char *function,
 		if (EXT4_SB(sb)->s_journal)
 			jbd2_journal_abort(EXT4_SB(sb)->s_journal, -EIO);
 		save_error_info(sb, function, line);
-	#ifdef CONFIG_MACH_LGE
-	/* LGE_CHANGE
-	 * put panic when ext4 partition is remounted as Read Only
-	 * 2014-04-15, [email protected]
-	 */
-	panic("EXT4-fs panic from previous error. remounted as RO \n");
-	#endif
-
 	}
 	if (test_opt(sb, ERRORS_PANIC))
 		panic("EXT4-fs panic from previous error\n");
@@ -1014,11 +1006,6 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-	/*
-	 * Make sure all delayed rcu free inodes are flushed before we
-	 * destroy cache.
-	 */
-	rcu_barrier();
 	kmem_cache_destroy(ext4_inode_cachep);
 }
 
@@ -3827,55 +3814,27 @@ no_journal:
 cantfind_ext4:
 	if (!silent)
 		ext4_msg(sb, KERN_ERR, "VFS: Can't find ext4 filesystem");
-#ifdef CONFIG_MACH_LGE
-/* LGE_CHANGE
- * add return code if ext4 superblock is damaged
- * 2014-01-16, [email protected]
- */
-	ret = -ESUPER;
-#endif
 	goto failed_mount;
 
 failed_mount7:
-#ifdef CONFIG_MACH_LGE
-	printk(KERN_ERR "EXT4-fs: failed_mount7\n");
-#endif
 	ext4_unregister_li_request(sb);
 failed_mount6:
-#ifdef CONFIG_MACH_LGE
-	printk(KERN_ERR "EXT4-fs: failed_mount6\n");
-#endif
 	ext4_mb_release(sb);
 failed_mount5:
-#ifdef CONFIG_MACH_LGE
-	printk(KERN_ERR "EXT4-fs: failed_mount5\n");
-#endif
 	ext4_ext_release(sb);
 	ext4_release_system_zone(sb);
 failed_mount4a:
-#ifdef CONFIG_MACH_LGE
-	printk(KERN_ERR "EXT4-fs: failed_mount4a\n");
-#endif
 	dput(sb->s_root);
 	sb->s_root = NULL;
 failed_mount4:
-#ifdef CONFIG_MACH_LGE
-	printk(KERN_ERR "EXT4-fs: failed_mount4\n");
-#endif
 	ext4_msg(sb, KERN_ERR, "mount failed");
 	destroy_workqueue(EXT4_SB(sb)->dio_unwritten_wq);
 failed_mount_wq:
-#ifdef CONFIG_MACH_LGE
-	printk(KERN_ERR "EXT4-fs: failed_mount_wq\n");
-#endif
 	if (sbi->s_journal) {
 		jbd2_journal_destroy(sbi->s_journal);
 		sbi->s_journal = NULL;
 	}
 failed_mount3:
-#ifdef CONFIG_MACH_LGE
-	printk(KERN_ERR "EXT4-fs: failed_mount3\n");
-#endif
 	del_timer(&sbi->s_err_report);
 	if (sbi->s_flex_groups)
 		ext4_kvfree(sbi->s_flex_groups);
@@ -3886,17 +3845,10 @@ failed_mount3:
 	if (sbi->s_mmp_tsk)
 		kthread_stop(sbi->s_mmp_tsk);
 failed_mount2:
-#ifdef CONFIG_MACH_LGE
-	printk(KERN_ERR "EXT4-fs: failed_mount2\n");
-	ret = -ESUPER;
-#endif
 	for (i = 0; i < db_count; i++)
 		brelse(sbi->s_group_desc[i]);
 	ext4_kvfree(sbi->s_group_desc);
 failed_mount:
-#ifdef CONFIG_MACH_LGE
-	printk(KERN_ERR "EXT4-fs: failed_mount\n");
-#endif
 	if (sbi->s_proc) {
 		remove_proc_entry("options", sbi->s_proc);
 		remove_proc_entry(sb->s_id, ext4_proc_root);