diff options
author | Felix Fietkau <nbd@openwrt.org> | 2016-03-07 17:56:58 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-03-07 17:56:58 +0000 |
commit | d37e8522233419d629d611c836794cb320d97388 (patch) | |
tree | 0f707b5f8bdcd25b13baf7e621f1e81f173a6b64 /target/linux/generic/patches-4.3/111-jffs2-add-RENAME_EXCHANGE-support.patch | |
parent | 1e91df0491af50d6bb3872bf1951e47c31694f3d (diff) | |
download | master-187ad058-d37e8522233419d629d611c836794cb320d97388.tar.gz master-187ad058-d37e8522233419d629d611c836794cb320d97388.tar.bz2 master-187ad058-d37e8522233419d629d611c836794cb320d97388.zip |
kernel: remove linux 4.3 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48955 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, 0 insertions, 58 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 deleted file mode 100644 index cc5f440be9..0000000000 --- a/target/linux/generic/patches-4.3/111-jffs2-add-RENAME_EXCHANGE-support.patch +++ /dev/null @@ -1,58 +0,0 @@ -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); |