[OpenWrt-Devel] Fix the incorrect i_nlink count after jffs2's RENAME_EXCHANGE operations.

Submitted by Jing Qiu on March 14, 2017, 7:32 a.m.

Details

Message ID 1489476728-17287-2-git-send-email-aqiu0720@gmail.com
State New
Headers show

Commit Message

Jing Qiu March 14, 2017, 7:32 a.m.
From: jingqiuELE <aqiu0720@gmail.com>

Signed-off-by: Jing Qiu <aqiu0720@gmail.com>
---
 .../111-jffs2-add-RENAME_EXCHANGE-support.patch    | 37 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
index b624087..fe53f72 100644
--- a/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
+++ b/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
@@ -5,18 +5,34 @@  Subject: [PATCH] jffs2: add RENAME_EXCHANGE support
 Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
---- a/fs/jffs2/dir.c
-+++ b/fs/jffs2/dir.c
-@@ -782,7 +782,7 @@ static int jffs2_rename (struct inode *o
+Index: linux-4.4.14/fs/jffs2/dir.c
+===================================================================
+--- linux-4.4.14.orig/fs/jffs2/dir.c
++++ linux-4.4.14/fs/jffs2/dir.c
+@@ -781,16 +781,29 @@ static int jffs2_rename (struct inode *o
+ 	struct jffs2_inode_info *victim_f = NULL;
  	uint8_t type;
  	uint32_t now;
++	struct inode *fst_inode = d_inode(old_dentry);
++	struct inode *snd_inode = d_inode(new_dentry);
  
 -	if (flags & ~RENAME_WHITEOUT)
 +	if (flags & ~(RENAME_WHITEOUT | RENAME_EXCHANGE))
  		return -EINVAL;
  
++	if((flags & RENAME_EXCHANGE) && (old_dir_i != new_dir_i)) {
++		if(S_ISDIR(fst_node->i_mode) && !S_ISDIR(snd_inode->i_mode)) {
++			inc_nlink(new_dir_i);
++			drop_nlink(old_dir_i);
++		}
++		else if(!S_ISDIR(fst_node->i_mode) && S_ISDIR(snd_inode->i_mode)) {
++			drop_nlink(new_dir_i);
++			inc_nlink(old_dir_i);
++		}
++	}
++
  	/* The VFS will check for us and prevent trying to rename a
-@@ -790,7 +790,7 @@ static int jffs2_rename (struct inode *o
+ 	 * file over a directory and vice versa, but if it's a directory,
  	 * the VFS can't check whether the victim is empty. The filesystem
  	 * needs to do that for itself.
  	 */
@@ -25,7 +41,7 @@  Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		victim_f = JFFS2_INODE_INFO(d_inode(new_dentry));
  		if (d_is_dir(new_dentry)) {
  			struct jffs2_full_dirent *fd;
-@@ -825,7 +825,7 @@ static int jffs2_rename (struct inode *o
+@@ -825,7 +838,7 @@ static int jffs2_rename (struct inode *o
  	if (ret)
  		return ret;
  
@@ -34,7 +50,14 @@  Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		/* There was a victim. Kill it off nicely */
  		if (d_is_dir(new_dentry))
  			clear_nlink(d_inode(new_dentry));
-@@ -851,6 +851,12 @@ static int jffs2_rename (struct inode *o
+@@ -845,12 +858,18 @@ static int jffs2_rename (struct inode *o
+ 
+ 	/* If it was a directory we moved, and there was no victim,
+ 	   increase i_nlink on its new parent */
+-	if (d_is_dir(old_dentry) && !victim_f)
++	if (d_is_dir(old_dentry) && !victim_f && !(flags & RENAME_EXCHANGE))
+ 		inc_nlink(new_dir_i);
+ 
  	if (flags & RENAME_WHITEOUT)
  		/* Replace with whiteout */
  		ret = jffs2_whiteout(old_dir_i, old_dentry);
@@ -47,7 +70,7 @@  Signed-off-by: Felix Fietkau <nbd@nbd.name>
  	else
  		/* Unlink the original */
  		ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
-@@ -882,7 +888,7 @@ static int jffs2_rename (struct inode *o
+@@ -882,7 +901,7 @@ static int jffs2_rename (struct inode *o
  		return ret;
  	}