diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2015-10-11 19:08:08 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-10-11 19:08:08 +0000 |
commit | ebc8ef9e87b724526a60e1670834fff4d3bc4698 (patch) | |
tree | 190d5518cb8fca114ade113bd2689f1b54852d08 /target/linux/generic/patches-4.3/111-jffs2-add-RENAME_EXCHANGE-support.patch | |
parent | 0ab09e313739ebe5a2d9c3c35354422149760383 (diff) | |
download | master-187ad058-ebc8ef9e87b724526a60e1670834fff4d3bc4698.tar.gz master-187ad058-ebc8ef9e87b724526a60e1670834fff4d3bc4698.tar.bz2 master-187ad058-ebc8ef9e87b724526a60e1670834fff4d3bc4698.zip |
kernel: generic: add kernel 4.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47182 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.3/111-jffs2-add-RENAME_EXCHANGE-support.patch')
-rw-r--r-- | target/linux/generic/patches-4.3/111-jffs2-add-RENAME_EXCHANGE-support.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.3/111-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/patches-4.3/111-jffs2-add-RENAME_EXCHANGE-support.patch new file mode 100644 index 0000000000..cc5f440be9 --- /dev/null +++ b/target/linux/generic/patches-4.3/111-jffs2-add-RENAME_EXCHANGE-support.patch @@ -0,0 +1,58 @@ +From: Felix Fietkau <nbd@openwrt.org> +Date: Sat, 25 Apr 2015 12:41:32 +0200 +Subject: [PATCH] jffs2: add RENAME_EXCHANGE support + +Signed-off-by: Felix Fietkau <nbd@openwrt.org> +--- + +--- a/fs/jffs2/dir.c ++++ b/fs/jffs2/dir.c +@@ -785,7 +785,7 @@ static int jffs2_rename (struct inode *o + uint8_t type; + uint32_t now; + +- if (flags & ~RENAME_WHITEOUT) ++ if (flags & ~(RENAME_WHITEOUT | RENAME_EXCHANGE)) + return -EINVAL; + + /* The VFS will check for us and prevent trying to rename a +@@ -793,7 +793,7 @@ static int jffs2_rename (struct inode *o + * the VFS can't check whether the victim is empty. The filesystem + * needs to do that for itself. + */ +- if (d_really_is_positive(new_dentry)) { ++ if (d_really_is_positive(new_dentry) && !(flags & RENAME_EXCHANGE)) { + victim_f = JFFS2_INODE_INFO(d_inode(new_dentry)); + if (d_is_dir(new_dentry)) { + struct jffs2_full_dirent *fd; +@@ -828,7 +828,7 @@ static int jffs2_rename (struct inode *o + if (ret) + return ret; + +- if (victim_f) { ++ if (victim_f && !(flags & RENAME_EXCHANGE)) { + /* There was a victim. Kill it off nicely */ + if (d_is_dir(new_dentry)) + clear_nlink(d_inode(new_dentry)); +@@ -854,6 +854,12 @@ static int jffs2_rename (struct inode *o + if (flags & RENAME_WHITEOUT) + /* Replace with whiteout */ + ret = jffs2_whiteout(old_dir_i, old_dentry); ++ else if (flags & RENAME_EXCHANGE) ++ /* Replace the original */ ++ ret = jffs2_do_link(c, JFFS2_INODE_INFO(old_dir_i), ++ d_inode(new_dentry)->i_ino, type, ++ old_dentry->d_name.name, old_dentry->d_name.len, ++ now); + else + /* Unlink the original */ + ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i), +@@ -880,7 +886,7 @@ static int jffs2_rename (struct inode *o + return ret; + } + +- if (d_is_dir(old_dentry)) ++ if (d_is_dir(old_dentry) && !(flags & RENAME_EXCHANGE)) + drop_nlink(old_dir_i); + + new_dir_i->i_mtime = new_dir_i->i_ctime = old_dir_i->i_mtime = old_dir_i->i_ctime = ITIME(now); |