mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
82 lines
2.7 KiB
Diff
82 lines
2.7 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Sat, 25 Apr 2015 12:41:32 +0200
|
|
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
|
|
@@ -779,18 +779,31 @@ static int jffs2_rename (struct inode *o
|
|
int ret;
|
|
struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb);
|
|
struct jffs2_inode_info *victim_f = NULL;
|
|
+ struct inode *fst_inode = d_inode(old_dentry);
|
|
+ struct inode *snd_inode = d_inode(new_dentry);
|
|
uint8_t type;
|
|
uint32_t now;
|
|
|
|
- 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_inode->i_mode) && !S_ISDIR(snd_inode->i_mode)) {
|
|
+ inc_nlink(new_dir_i);
|
|
+ drop_nlink(old_dir_i);
|
|
+ }
|
|
+ else if (!S_ISDIR(fst_inode->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
|
|
* 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.
|
|
*/
|
|
- 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;
|
|
@@ -825,7 +838,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));
|
|
@@ -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);
|
|
+ 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),
|
|
@@ -882,7 +901,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);
|