From 2ea6357e126e788156af80fed21a27bc0f5403c1 Mon Sep 17 00:00:00 2001
From: chenwei <chenwei26@huawei.com>
Date: Wed, 21 Apr 2021 17:13:22 +0800
Subject: [PATCH] Revert "fix: kernel crashed when delete a umounted folder"

Close: I3NGBT
Change-Id: I2a398c90edc0d543267f96d1c0dc19784639ab2d
---
 fs/jffs2/dir.c |  3 ---
 fs/jffs2/fs.c  | 10 ----------
 2 files changed, 13 deletions(-)

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index 6648a6a..80069e3 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -243,9 +243,6 @@ int jffs2_rmdir (struct jffs2_inode *dir_i, struct jffs2_inode *d_inode, const u
 	int ret;
 	uint32_t now = Jffs2CurSec();
 
-    if (c == NULL) {
-	    PRINT_ERR("%s-%d: sb_info null. sb=%p, inode=%p, vnode=%p\n", __FUNCTION__, __LINE__, dir_i->i_sb, dir_i, dir_i->i_vnode);
-    }
 	for (fd = f->dents ; fd; fd = fd->next) {
 		if (fd->ino) {
 			PRINT_ERR("%s-%d: ret=%d\n", __FUNCTION__, __LINE__, ENOTEMPTY);
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index e732376..d25e6f8 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -262,8 +262,6 @@ struct jffs2_inode *jffs2_iget(struct super_block *sb, uint32_t ino)
 	return inode;
 }
 
-extern int g_coveredVnodeTop;
-extern struct Vnode *g_coveredVnodeList[100];
 
 // -------------------------------------------------------------------------
 // Decrement the reference count on an inode. If this makes the ref count
@@ -277,13 +275,6 @@ int jffs2_iput(struct jffs2_inode *i)
 	// and gc.c jffs2_garbage_collect_pass
 	struct jffs2_inode_info *f = NULL;
 
-	for (int p = 0; p < g_coveredVnodeTop; p++) {
-		if (i->i_vnode == g_coveredVnodeList[p]) {
-			PRINTK("%s-%d: jffs2_iput mounted vnode. vnode=%p, inode=%p, i->i_nlink=%d\n", __FUNCTION__, __LINE__, i->i_vnode, i, i->i_nlink);
-		}
-	}
-
-	PRINTK("%s-%d: jffs2_iput vnode. vnode=%p, inode=%p, i->i_nlink=%d\n", __FUNCTION__, __LINE__, i->i_vnode, i, i->i_nlink);
 	Jffs2NodeLock();
 	if (!i || i->i_nlink) {
 		// and let it fault...
@@ -354,7 +345,6 @@ struct jffs2_inode *jffs2_new_inode (struct jffs2_inode *dir_i, int mode, struct
 	(void)Jffs2HashInsert(&sb->s_node_hash_lock, &sb->s_node_hash[0], inode, inode->i_ino);
 	Jffs2NodeUnlock();
 
-	PRINTK("%s-%d: inode=%p, i_nlink=%d\n", __FUNCTION__, __LINE__, inode, inode->i_nlink);
 	return inode;
 }
 
-- 
Gitee