generic: 5.15: rework pending patch

[openwrt/staging/pepe2k.git] / target / linux / generic / pending-5.15 / 140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch

diff --git a/target/linux/generic/pending-5.15/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/pending-5.15/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
index e48da41faedb7ee46feb662b5006819943de432c..61e133e382032ae4b38d0d0ea03e134a7603e8b9 100644 (file)
--- a/target/linux/generic/pending-5.15/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
+++ b/target/linux/generic/pending-5.15/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
@@ -8,13 +8,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/fs/jffs2/dir.c
 +++ b/fs/jffs2/dir.c
-@@ -609,7 +609,8 @@ static int jffs2_rmdir (struct inode *di
+@@ -609,8 +609,8 @@ static int jffs2_rmdir (struct inode *di
        return ret;
  }
  
--static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, umode_t mode, dev_t rdev)
-+static int __jffs2_mknod (struct inode *dir_i, struct dentry *dentry,
-+                        umode_t mode, dev_t rdev, bool whiteout)
+-static int jffs2_mknod (struct user_namespace *mnt_userns, struct inode *dir_i,
+-                      struct dentry *dentry, umode_t mode, dev_t rdev)
++static int __jffs2_mknod (struct user_namespace *mnt_userns, struct inode *dir_i,
++                        struct dentry *dentry, umode_t mode, dev_t rdev, bool whiteout)
  {
        struct jffs2_inode_info *f, *dir_f;
        struct jffs2_sb_info *c;
@@ -31,24 +32,26 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        return 0;
  
   fail:
-@@ -756,6 +761,17 @@ static int jffs2_mknod (struct inode *di
+@@ -756,6 +761,19 @@ static int jffs2_mknod (struct inode *di
        return ret;
  }
  
-+static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, umode_t mode, dev_t rdev)
++static int jffs2_mknod (struct user_namespace *mnt_userns, struct inode *dir_i,
++                        struct dentry *dentry, umode_t mode, dev_t rdev)
 +{
-+      return __jffs2_mknod(dir_i, dentry, mode, rdev, false);
++      return __jffs2_mknod(mnt_userns, dir_i, dentry, mode, rdev, false);
 +}
 +
-+static int jffs2_whiteout (struct inode *old_dir, struct dentry *old_dentry)
++static int jffs2_whiteout (struct user_namespace *mnt_userns, struct inode *old_dir,
++                          struct dentry *old_dentry)
 +{
-+      return __jffs2_mknod(old_dir, old_dentry, S_IFCHR | WHITEOUT_MODE,
++      return __jffs2_mknod(mnt_userns, old_dir, old_dentry, S_IFCHR | WHITEOUT_MODE,
 +                           WHITEOUT_DEV, true);
 +}
 +
- static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
+ static int jffs2_rename (struct user_namespace *mnt_userns,
+                        struct inode *old_dir_i, struct dentry *old_dentry,
                         struct inode *new_dir_i, struct dentry *new_dentry,
-                        unsigned int flags)
 @@ -766,7 +782,7 @@ static int jffs2_rename (struct inode *o
        uint8_t type;
        uint32_t now;
@@ -67,7 +70,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 -                            old_dentry->d_name.name, old_dentry->d_name.len, NULL, now);
 +      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
 +              /* Unlink the original */
 +              ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),