c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-03-11 04:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Linux 6.18: convert ida_simple_* calls

Browse Source 
ida_simple_get() and ida_simple_remove() are removed in 6.18. However,
since 4.19 they have been simple wrappers around ida_alloc() and
ida_free(), so we can just use those directly.

Sponsored-by: https://despairlabs.com/sponsor/
Signed-off-by: Rob Norris <robn@despairlabs.com>
This commit is contained in:
Rob Norris 2025-09-12 10:03:07 +10:00 committed by Tony Hutter
parent 9d50ee59dc
commit 5de4a297e7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/os/linux/zfs/zvol_os.c
View File

@ -21,7 +21,7 @@
*/ */
/* /*
* Copyright (c) 2012, 2020 by Delphix. All rights reserved. * Copyright (c) 2012, 2020 by Delphix. All rights reserved.
* Copyright (c) 2024, Rob Norris <robn@despairlabs.com> * Copyright (c) 2024, 2025, Rob Norris <robn@despairlabs.com>
* Copyright (c) 2024, 2025, Klara, Inc. * Copyright (c) 2024, 2025, Klara, Inc.
*/ */
@ -1500,7 +1500,7 @@ zvol_os_remove_minor(zvol_state_t *zv)
if (zso->use_blk_mq) if (zso->use_blk_mq)
blk_mq_free_tag_set(&zso->tag_set); blk_mq_free_tag_set(&zso->tag_set);
ida_simple_remove(&zvol_ida, MINOR(zso->zvo_dev) >> ZVOL_MINOR_BITS); ida_free(&zvol_ida, MINOR(zso->zvo_dev) >> ZVOL_MINOR_BITS);
kmem_free(zso, sizeof (struct zvol_state_os)); kmem_free(zso, sizeof (struct zvol_state_os));
@ -1655,7 +1655,7 @@ zvol_os_create_minor(const char *name)
if (zvol_inhibit_dev) if (zvol_inhibit_dev)
return (0); return (0);
idx = ida_simple_get(&zvol_ida, 0, 0, kmem_flags_convert(KM_SLEEP)); idx = ida_alloc(&zvol_ida, kmem_flags_convert(KM_SLEEP));
if (idx < 0) if (idx < 0)
return (SET_ERROR(-idx)); return (SET_ERROR(-idx));
minor = idx << ZVOL_MINOR_BITS; minor = idx << ZVOL_MINOR_BITS;
@ -1663,7 +1663,7 @@ zvol_os_create_minor(const char *name)
/* too many partitions can cause an overflow */ /* too many partitions can cause an overflow */
zfs_dbgmsg("zvol: create minor overflow: %s, minor %u/%u", zfs_dbgmsg("zvol: create minor overflow: %s, minor %u/%u",
name, minor, MINOR(minor)); name, minor, MINOR(minor));
ida_simple_remove(&zvol_ida, idx); ida_free(&zvol_ida, idx);
return (SET_ERROR(EINVAL)); return (SET_ERROR(EINVAL));
} }
@ -1671,7 +1671,7 @@ zvol_os_create_minor(const char *name)
if (zv) { if (zv) {
ASSERT(MUTEX_HELD(&zv->zv_state_lock)); ASSERT(MUTEX_HELD(&zv->zv_state_lock));
mutex_exit(&zv->zv_state_lock); mutex_exit(&zv->zv_state_lock);
ida_simple_remove(&zvol_ida, idx); ida_free(&zvol_ida, idx);
return (SET_ERROR(EEXIST)); return (SET_ERROR(EEXIST));
} }
@ -1771,7 +1771,7 @@ out_doi:
rw_exit(&zvol_state_lock); rw_exit(&zvol_state_lock);
error = zvol_os_add_disk(zv->zv_zso->zvo_disk); error = zvol_os_add_disk(zv->zv_zso->zvo_disk);
} else { } else {
ida_simple_remove(&zvol_ida, idx); ida_free(&zvol_ida, idx);
} }
return (error); return (error);