sysfs: separate out dup filename warning into a separate function

Separate out sysfs_warn_dup() out of sysfs_add_one().  This will help
separating out the core sysfs functionalities into kernfs so that it
can be used by non-sysfs users too.

This doesn't make any functional changes.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 486238d06021b44d2061f02c110e187c8ed817a5..de47ed32d5c72f565d8d89f08f7f72e253ff9489 100644 (file)
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -470,6 +470,23 @@ static char *sysfs_pathname(struct sysfs_dirent *sd, char *path)
        return path;
 }
 
+void sysfs_warn_dup(struct sysfs_dirent *parent, const char *name)
+{
+       char *path;
+
+       path = kzalloc(PATH_MAX, GFP_KERNEL);
+       if (path) {
+               sysfs_pathname(parent, path);
+               strlcat(path, "/", PATH_MAX);
+               strlcat(path, name, PATH_MAX);
+       }
+
+       WARN(1, KERN_WARNING "sysfs: cannot create duplicate filename '%s'\n",
+            path ? path : name);
+
+       kfree(path);
+}
+
 /**
  *     sysfs_add_one - add sysfs_dirent to parent
  *     @acxt: addrm context to use
@@ -497,18 +514,9 @@ int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd,
        int ret;
 
        ret = __sysfs_add_one(acxt, sd, parent_sd);
-       if (ret == -EEXIST) {
-               char *path = kzalloc(PATH_MAX, GFP_KERNEL);
-               WARN(1, KERN_WARNING
-                    "sysfs: cannot create duplicate filename '%s'\n",
-                    (path == NULL) ? sd->s_name
-                                   : (sysfs_pathname(parent_sd, path),
-                                      strlcat(path, "/", PATH_MAX),
-                                      strlcat(path, sd->s_name, PATH_MAX),
-                                      path));
-               kfree(path);
-       }
 
+       if (ret == -EEXIST)
+               sysfs_warn_dup(parent_sd, sd->s_name);
        return ret;
 }
 

diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
index 8d3dc1ddb546d346762417f55be08c4e6657f2e2..05d063fe69c76defd6e8a589d1d6f438f82dbe92 100644 (file)
--- a/fs/sysfs/sysfs.h
+++ b/fs/sysfs/sysfs.h
@@ -168,6 +168,7 @@ extern const struct inode_operations sysfs_dir_inode_operations;
 struct sysfs_dirent *sysfs_get_active(struct sysfs_dirent *sd);
 void sysfs_put_active(struct sysfs_dirent *sd);
 void sysfs_addrm_start(struct sysfs_addrm_cxt *acxt);
+void sysfs_warn_dup(struct sysfs_dirent *parent, const char *name);
 int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd,
                    struct sysfs_dirent *parent_sd);
 int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd,