Merge tag 'v4.0-rc2' into timers/core, to refresh the tree before pulling more changes

[cascardo/linux.git] / fs / kernfs / dir.c

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 2d881b3..6acc964 100644 (file)
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -411,8 +411,9 @@ void kernfs_put(struct kernfs_node *kn)
 
        if (kernfs_type(kn) == KERNFS_LINK)
                kernfs_put(kn->symlink.target_kn);
-       if (!(kn->flags & KERNFS_STATIC_NAME))
-               kfree(kn->name);
+
+       kfree_const(kn->name);
+
        if (kn->iattr) {
                if (kn->iattr->ia_secdata)
                        security_release_secctx(kn->iattr->ia_secdata,
@@ -506,15 +507,12 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,
                                             const char *name, umode_t mode,
                                             unsigned flags)
 {
-       char *dup_name = NULL;
        struct kernfs_node *kn;
        int ret;
 
-       if (!(flags & KERNFS_STATIC_NAME)) {
-               name = dup_name = kstrdup(name, GFP_KERNEL);
-               if (!name)
-                       return NULL;
-       }
+       name = kstrdup_const(name, GFP_KERNEL);
+       if (!name)
+               return NULL;
 
        kn = kmem_cache_zalloc(kernfs_node_cache, GFP_KERNEL);
        if (!kn)
@@ -538,7 +536,7 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,
  err_out2:
        kmem_cache_free(kernfs_node_cache, kn);
  err_out1:
-       kfree(dup_name);
+       kfree_const(name);
        return NULL;
 }
 
@@ -1264,7 +1262,7 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent,
        /* rename kernfs_node */
        if (strcmp(kn->name, new_name) != 0) {
                error = -ENOMEM;
-               new_name = kstrdup(new_name, GFP_KERNEL);
+               new_name = kstrdup_const(new_name, GFP_KERNEL);
                if (!new_name)
                        goto out;
        } else {
@@ -1285,9 +1283,7 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent,
 
        kn->ns = new_ns;
        if (new_name) {
-               if (!(kn->flags & KERNFS_STATIC_NAME))
-                       old_name = kn->name;
-               kn->flags &= ~KERNFS_STATIC_NAME;
+               old_name = kn->name;
                kn->name = new_name;
        }
 
@@ -1297,7 +1293,7 @@ int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent,
        kernfs_link_sibling(kn);
 
        kernfs_put(old_parent);
-       kfree(old_name);
+       kfree_const(old_name);
 
        error = 0;
  out: