kernel: bump 5.4 to 5.4.211

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch

diff --git a/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch b/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
index f2559cdab3498c71e337a0514adee8f7cdef39cf..79323b618d1ade917e70f99545c2c7458a028d09 100644 (file)
--- a/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
+++ b/target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
@@ -27,7 +27,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
        /* internal flags, do not use outside cgroup core proper */
        __CFTYPE_ONLY_ON_DFL    = (1 << 16),    /* only on default hierarchy */
        __CFTYPE_NOT_ON_DFL     = (1 << 17),    /* not on default hierarchy */
-@@ -544,6 +546,7 @@ struct cftype {
+@@ -545,6 +547,7 @@ struct cftype {
         * end of cftype array.
         */
        char name[MAX_CFTYPE_NAME];
@@ -37,7 +37,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
        /*
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -1465,8 +1465,8 @@ struct cgroup *task_cgroup_from_root(str
+@@ -1467,8 +1467,8 @@ struct cgroup *task_cgroup_from_root(str
  
  static struct kernfs_syscall_ops cgroup_kf_syscall_ops;
  
@@ -48,7 +48,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  {
        struct cgroup_subsys *ss = cft->ss;
  
-@@ -1476,13 +1476,26 @@ static char *cgroup_file_name(struct cgr
+@@ -1478,13 +1478,26 @@ static char *cgroup_file_name(struct cgr
  
                snprintf(buf, CGROUP_FILE_NAME_MAX, "%s%s.%s",
                         dbg, cgroup_on_dfl(cgrp) ? ss->name : ss->legacy_name,
@@ -77,7 +77,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  /**
   * cgroup_file_mode - deduce file mode of a control file
   * @cft: the control file in question
-@@ -1641,6 +1654,9 @@ static void cgroup_rm_file(struct cgroup
+@@ -1643,6 +1656,9 @@ static void cgroup_rm_file(struct cgroup
        }
  
        kernfs_remove_by_name(cgrp->kn, cgroup_file_name(cgrp, cft, name));
@@ -87,7 +87,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
  }
  
  /**
-@@ -3924,6 +3940,7 @@ static int cgroup_add_file(struct cgroup
+@@ -3933,6 +3949,7 @@ static int cgroup_add_file(struct cgroup
  {
        char name[CGROUP_FILE_NAME_MAX];
        struct kernfs_node *kn;
@@ -95,7 +95,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
        struct lock_class_key *key = NULL;
        int ret;
  
-@@ -3954,6 +3971,14 @@ static int cgroup_add_file(struct cgroup
+@@ -3963,6 +3980,14 @@ static int cgroup_add_file(struct cgroup
                spin_unlock_irq(&cgroup_file_kn_lock);
        }