Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 4.2 compat: misc_deregister() 

The misc_deregister() function was changed to a void return type.
Rather than add compatibility code to detect this change simply
ignore the return code on all kernels.  It was only used to log
an informational error message of no real value.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2015-09-01 09:23:02 -07:00
parent 278bee9319
commit 324dcd3733
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/zfs/zfs_ioctl.c
View File

@ -6028,13 +6028,9 @@ zfs_attach(void)
static void
zfs_detach(void)
{
int error;
zfsdev_state_t *zs, *zsprev = NULL;
error = misc_deregister(&zfs_misc);
if (error != 0)
printk(KERN_INFO "ZFS: misc_deregister() failed %d\n", error);
misc_deregister(&zfs_misc);
mutex_destroy(&zfsdev_state_lock);
for (zs = zfsdev_state_list; zs != NULL; zs = zs->zs_next) {

6
module/zpios/pios.c
View File

@ -1310,11 +1310,7 @@ zpios_init(void)
static void __exit
zpios_fini(void)
{
int error;
error = misc_deregister(&zpios_misc);
if (error)
printk(KERN_INFO "ZPIOS: misc_deregister() failed %d\n", error);
misc_deregister(&zpios_misc);
printk(KERN_INFO "ZPIOS: Unloaded module v%s-%s%s\n",
ZFS_META_VERSION, ZFS_META_RELEASE, ZFS_DEBUG_STR);