ocfs2: free inode when i_count becomes zero

Commit Message

Xue jiufei June 11, 2014, 7:07 a.m. UTC

Disk inode deletion may be heavily delayed when one node unlink a file
after the same dentry is freed on another node(say N1) because of
memory shrink but inode is left in memory. This inode can only be freed
while N1 doing the orphan scan work. However, N1 may skip orphan scan
for several times because other nodes may do the work earlier. In our
tests, it may take 1 hour on 4 nodes cluster and this will cause bad
user experience. So We think inode should be freed when i_count becomes
zero to avoid such circumstances.

Signed-off-by: joyce.xue <[e-mail]>
---
 fs/ocfs2/inode.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Patch

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 437de7f..a490bc5 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -1192,17 +1192,9 @@  void ocfs2_evict_inode(struct inode *inode)
 int ocfs2_drop_inode(struct inode *inode)
 {
 	struct ocfs2_inode_info *oi = OCFS2_I(inode);
-	int res;
-
 	trace_ocfs2_drop_inode((unsigned long long)oi->ip_blkno,
 				inode->i_nlink, oi->ip_flags);
-
-	if (oi->ip_flags & OCFS2_INODE_MAYBE_ORPHANED)
-		res = 1;
-	else
-		res = generic_drop_inode(inode);
-
-	return res;
+	return 1; 
 }
 
 /*