generic: 6.6: manually refresh pending patches

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

diff --git a/target/linux/generic/pending-6.6/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/pending-6.6/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
index 8f40ae3ba2400d170b69e6cc1951c8b896e86afe..b82f3d80129e02c3acd1d374e75be2a26efd0407 100644 (file)
--- a/target/linux/generic/pending-6.6/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
+++ b/target/linux/generic/pending-6.6/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
@@ -8,18 +8,18 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/fs/jffs2/dir.c
 +++ b/fs/jffs2/dir.c
-@@ -614,8 +614,8 @@ static int jffs2_rmdir (struct inode *di
+@@ -617,8 +617,8 @@ static int jffs2_rmdir (struct inode *di
        return ret;
  }
  
--static int jffs2_mknod (struct user_namespace *mnt_userns, struct inode *dir_i,
+-static int jffs2_mknod (struct mnt_idmap *idmap, 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)
++static int __jffs2_mknod (struct mnt_idmap *idmap, 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;
-@@ -754,7 +754,11 @@ static int jffs2_mknod (struct user_name
+@@ -758,7 +758,11 @@ static int jffs2_mknod (struct mnt_idmap
        mutex_unlock(&dir_f->sem);
        jffs2_complete_reservation(c);
  
@@ -32,27 +32,27 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        return 0;
  
   fail:
-@@ -762,6 +766,19 @@ static int jffs2_mknod (struct user_name
+@@ -766,6 +770,19 @@ static int jffs2_mknod (struct mnt_idmap
        return ret;
  }
  
-+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 mnt_idmap *idmap, struct inode *dir_i,
++                      struct dentry *dentry, umode_t mode, dev_t rdev)
 +{
-+      return __jffs2_mknod(mnt_userns, dir_i, dentry, mode, rdev, false);
++      return __jffs2_mknod(idmap, dir_i, dentry, mode, rdev, false);
 +}
 +
-+static int jffs2_whiteout (struct user_namespace *mnt_userns, struct inode *old_dir,
-+                          struct dentry *old_dentry)
++static int jffs2_whiteout (struct mnt_idmap *idmap, struct inode *old_dir,
++                         struct dentry *old_dentry)
 +{
-+      return __jffs2_mknod(mnt_userns, old_dir, old_dentry, S_IFCHR | WHITEOUT_MODE,
++      return __jffs2_mknod(idmap, old_dir, old_dentry, S_IFCHR | WHITEOUT_MODE,
 +                           WHITEOUT_DEV, true);
 +}
 +
- static int jffs2_rename (struct user_namespace *mnt_userns,
+ static int jffs2_rename (struct mnt_idmap *idmap,
                         struct inode *old_dir_i, struct dentry *old_dentry,
                         struct inode *new_dir_i, struct dentry *new_dentry,
-@@ -773,7 +790,7 @@ static int jffs2_rename (struct user_nam
+@@ -777,7 +794,7 @@ static int jffs2_rename (struct mnt_idma
        uint8_t type;
        uint32_t now;
  
@@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                return -EINVAL;
  
        /* The VFS will check for us and prevent trying to rename a
-@@ -839,9 +856,14 @@ static int jffs2_rename (struct user_nam
+@@ -843,9 +860,14 @@ static int jffs2_rename (struct mnt_idma
        if (d_is_dir(old_dentry) && !victim_f)
                inc_nlink(new_dir_i);
  
@@ -70,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(mnt_userns, old_dir_i, old_dentry);
++              ret = jffs2_whiteout(idmap, old_dir_i, old_dentry);
 +      else
 +              /* Unlink the original */
 +              ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),