From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Fri, 16 Mar 2007 15:15:45 +0000 (+0100)
Subject: [JFFS2] Obsolete dirent nodes immediately on unlink, where possible.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a491486a2087ac3dfc00efb4f838c8d684afaf54;p=linux-beck.git

[JFFS2] Obsolete dirent nodes immediately on unlink, where possible.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c
index 67176792e138..57a79a6ba3d9 100644
--- a/fs/jffs2/write.c
+++ b/fs/jffs2/write.c
@@ -507,8 +507,7 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,
 	uint32_t alloclen;
 	int ret;
 
-	if (1 /* alternative branch needs testing */ ||
-	    !jffs2_can_mark_obsolete(c)) {
+	if (!jffs2_can_mark_obsolete(c)) {
 		/* We can't mark stuff obsolete on the medium. We need to write a deletion dirent */
 
 		rd = jffs2_alloc_raw_dirent();