apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

sysfs: move sysfs_hash_and_remove() to fs/sysfs/dir.c

Browse Source 
Most removal related logic is implemented in fs/sysfs/dir.c.  Move
sysfs_hash_and_remove() to fs/sysfs/dir.c so that __sysfs_remove()
doesn't have to be public.

This is pure relocation.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tejun Heo
2013-10-24 11:49:10 -04:00
committed by Greg Kroah-Hartman
parent baa97cb507
commit 7eed6ecb07
3 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/sysfs/dir.c
+37 -1
View File
@@ -813,7 +813,8 @@ static struct sysfs_dirent *sysfs_next_descendant_post(struct sysfs_dirent *pos,
return pos->s_parent;
}
void __sysfs_remove(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
static void __sysfs_remove(struct sysfs_addrm_cxt *acxt,
struct sysfs_dirent *sd)
{
struct sysfs_dirent *pos, *next;
@@ -846,6 +847,41 @@ void sysfs_remove(struct sysfs_dirent *sd)
sysfs_addrm_finish(&acxt);
}
/**
* sysfs_hash_and_remove - find a sysfs_dirent by name and remove it
* @dir_sd: parent of the target
* @name: name of the sysfs_dirent to remove
* @ns: namespace tag of the sysfs_dirent to remove
*
* Look for the sysfs_dirent with @name and @ns under @dir_sd and remove
* it. Returns 0 on success, -ENOENT if such entry doesn't exist.
*/
int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const char *name,
const void *ns)
{
struct sysfs_addrm_cxt acxt;
struct sysfs_dirent *sd;
if (!dir_sd) {
WARN(1, KERN_WARNING "sysfs: can not remove '%s', no directory\n",
name);
return -ENOENT;
}
sysfs_addrm_start(&acxt);
sd = sysfs_find_dirent(dir_sd, name, ns);
if (sd)
__sysfs_remove(&acxt, sd);
sysfs_addrm_finish(&acxt);
if (sd)
return 0;
else
return -ENOENT;
}
/**
* sysfs_remove_dir - remove an object's directory.
* @kobj: object.