diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2021-11-05 00:48:27 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 00:07:34 +0000 |
| commit | 483503603cb210919088294051e6d27de1f03718 (patch) | |
| tree | dca6df4d449c46344976d6bea10435678ac61b75 /target/linux/generic/pending-5.15/141-jffs2-add-RENAME_EXCHANGE-support.patch | |
| parent | 1f302afd7350f46ec0fcc4b12b0ad59ac92fe5b6 (diff) | |
| download | upstream-483503603cb210919088294051e6d27de1f03718.tar.gz upstream-483503603cb210919088294051e6d27de1f03718.tar.bz2 upstream-483503603cb210919088294051e6d27de1f03718.zip | |
generic: 5.15: rework pending patch
Rework pending patch for kernel 5.15
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/141-jffs2-add-RENAME_EXCHANGE-support.patch')
| -rw-r--r-- | target/linux/generic/pending-5.15/141-jffs2-add-RENAME_EXCHANGE-support.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/pending-5.15/141-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/pending-5.15/141-jffs2-add-RENAME_EXCHANGE-support.patch index dbc72339c6..7dc830ac37 100644 --- a/target/linux/generic/pending-5.15/141-jffs2-add-RENAME_EXCHANGE-support.patch +++ b/target/linux/generic/pending-5.15/141-jffs2-add-RENAME_EXCHANGE-support.patch @@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> @@ -851,6 +864,12 @@ static int jffs2_rename (struct inode *o if (flags & RENAME_WHITEOUT) /* Replace with whiteout */ - ret = jffs2_whiteout(old_dir_i, old_dentry); + ret = jffs2_whiteout(mnt_userns, old_dir_i, old_dentry); + else if (flags & RENAME_EXCHANGE) + /* Replace the original */ + ret = jffs2_do_link(c, JFFS2_INODE_INFO(old_dir_i), |