mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-03 14:34:27 -05:00
5b6bca812d
Refresh pending patches for kernel 6.6. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Weijie Gao <hackpascal@gmail.com>
74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: jffs2: add RENAME_EXCHANGE support
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/fs/jffs2/dir.c
|
|
+++ b/fs/jffs2/dir.c
|
|
@@ -791,18 +791,31 @@ static int jffs2_rename (struct mnt_idma
|
|
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_NOREPLACE|RENAME_WHITEOUT))
|
|
+ if (flags & ~(RENAME_NOREPLACE|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;
|
|
@@ -837,7 +850,7 @@ static int jffs2_rename (struct mnt_idma
|
|
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));
|
|
@@ -863,6 +876,12 @@ static int jffs2_rename (struct mnt_idma
|
|
if (flags & RENAME_WHITEOUT)
|
|
/* Replace with whiteout */
|
|
ret = jffs2_whiteout(idmap, 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),
|
|
@@ -895,7 +914,7 @@ static int jffs2_rename (struct mnt_idma
|
|
return ret;
|
|
}
|
|
|
|
- if (d_is_dir(old_dentry))
|
|
+ if (d_is_dir(old_dentry) && !(flags & RENAME_EXCHANGE))
|
|
drop_nlink(old_dir_i);
|
|
|
|
old_dir_i->i_mtime = inode_set_ctime_to_ts(old_dir_i, ITIME(now));
|