Commit 967e35dc authored by Tejun Heo's avatar Tejun Heo Committed by Greg Kroah-Hartman

sysfs: cosmetic clean up on node creation failure paths

Node addition failure is detected by testing return value of
sysfs_addfm_finish() which returns the number of added and removed
nodes.  As the function is called as the last step of addition right
on top of error handling block, the if blocks looked like the
following.

	if (sysfs_addrm_finish(&acxt))
		success handling, usually return;
	/* fall through to error handling */

This is the opposite of usual convention in sysfs and makes the code
difficult to understand.  This patch inverts the test and makes those
blocks look more like others.
Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Cc: Gabriel C <nix.or.die@googlemail.com>
Cc: Miles Lane <miles.lane@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a1da4dfe
......@@ -699,17 +699,19 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
/* link in */
sysfs_addrm_start(&acxt, parent_sd);
if (!sysfs_find_dirent(parent_sd, name)) {
sysfs_add_one(&acxt, sd);
sysfs_link_sibling(sd);
}
if (sysfs_addrm_finish(&acxt)) {
*p_sd = sd;
return 0;
if (!sysfs_addrm_finish(&acxt)) {
sysfs_put(sd);
return -EEXIST;
}
sysfs_put(sd);
return -EEXIST;
*p_sd = sd;
return 0;
}
int sysfs_create_subdir(struct kobject *kobj, const char *name,
......
......@@ -410,11 +410,12 @@ int sysfs_add_file(struct sysfs_dirent *dir_sd, const struct attribute *attr,
sysfs_link_sibling(sd);
}
if (sysfs_addrm_finish(&acxt))
return 0;
if (!sysfs_addrm_finish(&acxt)) {
sysfs_put(sd);
return -EEXIST;
}
sysfs_put(sd);
return -EEXIST;
return 0;
}
......
......@@ -97,11 +97,13 @@ int sysfs_create_link(struct kobject * kobj, struct kobject * target, const char
sysfs_link_sibling(sd);
}
if (sysfs_addrm_finish(&acxt))
return 0;
if (!sysfs_addrm_finish(&acxt)) {
error = -EEXIST;
goto out_put;
}
return 0;
error = -EEXIST;
/* fall through */
out_put:
sysfs_put(target_sd);
sysfs_put(sd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment