leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kobject: convert fs/* from kobject_unregister() to kobject_put()

Browse Source 
There is no need for kobject_unregister() anymore, thanks to Kay's
kobject cleanup changes, so replace all instances of it with
kobject_put().


Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2007-12-20 08:13:05 -08:00
parent c10997f657
commit 197b12d679
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/configfs/mount.c
View File

@ -150,7 +150,7 @@ static int __init configfs_init(void)
err = register_filesystem(&configfs_fs_type); err = register_filesystem(&configfs_fs_type);
if (err) { if (err) {
printk(KERN_ERR "configfs: Unable to register filesystem!\n"); printk(KERN_ERR "configfs: Unable to register filesystem!\n");
kobject_unregister(config_kobj); kobject_put(config_kobj);
kmem_cache_destroy(configfs_dir_cachep); kmem_cache_destroy(configfs_dir_cachep);
configfs_dir_cachep = NULL; configfs_dir_cachep = NULL;
goto out; goto out;
@ -159,7 +159,7 @@ static int __init configfs_init(void)
err = configfs_inode_init(); err = configfs_inode_init();
if (err) { if (err) {
unregister_filesystem(&configfs_fs_type); unregister_filesystem(&configfs_fs_type);
kobject_unregister(config_kobj); kobject_put(config_kobj);
kmem_cache_destroy(configfs_dir_cachep); kmem_cache_destroy(configfs_dir_cachep);
configfs_dir_cachep = NULL; configfs_dir_cachep = NULL;
} }
@ -170,7 +170,7 @@ out:
static void __exit configfs_exit(void) static void __exit configfs_exit(void)
{ {
unregister_filesystem(&configfs_fs_type); unregister_filesystem(&configfs_fs_type);
kobject_unregister(config_kobj); kobject_put(config_kobj);
kmem_cache_destroy(configfs_dir_cachep); kmem_cache_destroy(configfs_dir_cachep);
configfs_dir_cachep = NULL; configfs_dir_cachep = NULL;
configfs_inode_exit(); configfs_inode_exit();

4
fs/debugfs/inode.c
View File

@ -438,7 +438,7 @@ static int __init debugfs_init(void)
retval = register_filesystem(&debug_fs_type); retval = register_filesystem(&debug_fs_type);
if (retval) if (retval)
kobject_unregister(debug_kobj); kobject_put(debug_kobj);
return retval; return retval;
} }
@ -446,7 +446,7 @@ static void __exit debugfs_exit(void)
{ {
simple_release_fs(&debugfs_mount, &debugfs_mount_count); simple_release_fs(&debugfs_mount, &debugfs_mount_count);
unregister_filesystem(&debug_fs_type); unregister_filesystem(&debug_fs_type);
kobject_unregister(debug_kobj); kobject_put(debug_kobj);
} }
core_initcall(debugfs_init); core_initcall(debugfs_init);

4
fs/dlm/lockspace.c
View File

@ -579,7 +579,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
kfree(ls->ls_rsbtbl); kfree(ls->ls_rsbtbl);
out_lsfree: out_lsfree:
if (do_unreg) if (do_unreg)
kobject_unregister(&ls->ls_kobj); kobject_put(&ls->ls_kobj);
else else
kfree(ls); kfree(ls);
out: out:
@ -728,7 +728,7 @@ static int release_lockspace(struct dlm_ls *ls, int force)
dlm_clear_members(ls); dlm_clear_members(ls);
dlm_clear_members_gone(ls); dlm_clear_members_gone(ls);
kfree(ls->ls_node_array); kfree(ls->ls_node_array);
kobject_unregister(&ls->ls_kobj); kobject_put(&ls->ls_kobj);
/* The ls structure will be freed when the kobject is done with */ /* The ls structure will be freed when the kobject is done with */
mutex_lock(&ls_lock); mutex_lock(&ls_lock);

4
fs/ecryptfs/main.c
View File

@ -767,7 +767,7 @@ static int do_sysfs_registration(void)
if (rc) { if (rc) {
printk(KERN_ERR printk(KERN_ERR
"Unable to create ecryptfs version attributes\n"); "Unable to create ecryptfs version attributes\n");
kobject_unregister(ecryptfs_kobj); kobject_put(ecryptfs_kobj);
} }
out: out:
return rc; return rc;
@ -776,7 +776,7 @@ out:
static void do_sysfs_unregistration(void) static void do_sysfs_unregistration(void)
{ {
sysfs_remove_group(ecryptfs_kobj, &attr_group); sysfs_remove_group(ecryptfs_kobj, &attr_group);
kobject_unregister(ecryptfs_kobj); kobject_put(ecryptfs_kobj);
} }
static int __init ecryptfs_init(void) static int __init ecryptfs_init(void)

6
fs/fuse/inode.c
View File

@ -810,15 +810,15 @@ static int fuse_sysfs_init(void)
return 0; return 0;
out_fuse_unregister: out_fuse_unregister:
kobject_unregister(fuse_kobj); kobject_put(fuse_kobj);
out_err: out_err:
return err; return err;
} }
static void fuse_sysfs_cleanup(void) static void fuse_sysfs_cleanup(void)
{ {
kobject_unregister(connections_kobj); kobject_put(connections_kobj);
kobject_unregister(fuse_kobj); kobject_put(fuse_kobj);
} }
static int __init fuse_init(void) static int __init fuse_init(void)

2
fs/gfs2/locking/dlm/sysfs.c
View File

@ -207,7 +207,7 @@ int gdlm_kobject_setup(struct gdlm_ls *ls, struct kobject *fskobj)
void gdlm_kobject_release(struct gdlm_ls *ls) void gdlm_kobject_release(struct gdlm_ls *ls)
{ {
kobject_unregister(&ls->kobj); kobject_put(&ls->kobj);
} }
int gdlm_sysfs_init(void) int gdlm_sysfs_init(void)

4
fs/gfs2/sys.c
View File

@ -525,7 +525,7 @@ fail_counters:
fail_lockstruct: fail_lockstruct:
sysfs_remove_group(&sdp->sd_kobj, &lockstruct_group); sysfs_remove_group(&sdp->sd_kobj, &lockstruct_group);
fail_reg: fail_reg:
kobject_unregister(&sdp->sd_kobj); kobject_put(&sdp->sd_kobj);
fail: fail:
fs_err(sdp, "error %d adding sysfs files", error); fs_err(sdp, "error %d adding sysfs files", error);
return error; return error;
@ -537,7 +537,7 @@ void gfs2_sys_fs_del(struct gfs2_sbd *sdp)
sysfs_remove_group(&sdp->sd_kobj, &args_group); sysfs_remove_group(&sdp->sd_kobj, &args_group);
sysfs_remove_group(&sdp->sd_kobj, &counters_group); sysfs_remove_group(&sdp->sd_kobj, &counters_group);
sysfs_remove_group(&sdp->sd_kobj, &lockstruct_group); sysfs_remove_group(&sdp->sd_kobj, &lockstruct_group);
kobject_unregister(&sdp->sd_kobj); kobject_put(&sdp->sd_kobj);
} }
int gfs2_sys_init(void) int gfs2_sys_init(void)

6
fs/partitions/check.c
View File

@ -314,7 +314,7 @@ void delete_partition(struct gendisk *disk, int part)
p->nr_sects = 0; p->nr_sects = 0;
p->ios[0] = p->ios[1] = 0; p->ios[0] = p->ios[1] = 0;
p->sectors[0] = p->sectors[1] = 0; p->sectors[0] = p->sectors[1] = 0;
kobject_unregister(p->holder_dir); kobject_put(p->holder_dir);
device_del(&p->dev); device_del(&p->dev);
put_device(&p->dev); put_device(&p->dev);
} }
@ -505,8 +505,8 @@ void del_gendisk(struct gendisk *disk)
disk_stat_set_all(disk, 0); disk_stat_set_all(disk, 0);
disk->stamp = 0; disk->stamp = 0;
kobject_unregister(disk->holder_dir); kobject_put(disk->holder_dir);
kobject_unregister(disk->slave_dir); kobject_put(disk->slave_dir);
disk->driverfs_dev = NULL; disk->driverfs_dev = NULL;
#ifndef CONFIG_SYSFS_DEPRECATED #ifndef CONFIG_SYSFS_DEPRECATED
sysfs_remove_link(block_depr, disk->dev.bus_id); sysfs_remove_link(block_depr, disk->dev.bus_id);