---

yaml --- r: 257408 b: refs/heads/master c: 22ba747 h: refs/heads/master v: v3
git-mirror · Jul 22, 2011 · d1c8242 · d1c8242
1 parent 218a5f8
commit d1c8242
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 841590ce16c19a3ce38028adfc8b1955482ee00c
+refs/heads/master: 22ba747f660c0acd14761628c24aa972d18058a0
diff --git a/trunk/fs/jffs2/dir.c b/trunk/fs/jffs2/dir.c
@@ -820,7 +820,10 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
 
 	if (victim_f) {
 		/* There was a victim. Kill it off nicely */
-		drop_nlink(new_dentry->d_inode);
+		if (S_ISDIR(new_dentry->d_inode->i_mode))
+			clear_nlink(new_dentry->d_inode);
+		else
+			drop_nlink(new_dentry->d_inode);
 		/* Don't oops if the victim was a dirent pointing to an
 		   inode which didn't exist. */
 		if (victim_f->inocache) {