diff options
| author | Alexander Aring <aahringo@redhat.com> | 2024-05-28 17:12:39 -0400 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2024-05-31 11:04:54 -0500 |
| commit | fa0b54f17afe5c7449b1f0de3eb8a372f637ed30 (patch) | |
| tree | ef75a63395ad820dee7e5c607430337cf4e5a646 /fs/dlm/dlm_internal.h | |
| parent | f455eb8490acab680ddee79613e511e18a59c8b1 (diff) | |
| download | linux-next-fa0b54f17afe5c7449b1f0de3eb8a372f637ed30.tar.gz linux-next-fa0b54f17afe5c7449b1f0de3eb8a372f637ed30.zip | |
dlm: move recover idr to xarray datastructure
According to kdoc idr is deprecated and xarrays should be used nowadays.
This patch is moving the recover idr implementation to xarray
datastructure.
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/dlm_internal.h')
| -rw-r--r-- | fs/dlm/dlm_internal.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index 015f2b2a83f6..9e68e68bf0cf 100644 --- a/fs/dlm/dlm_internal.h +++ b/fs/dlm/dlm_internal.h @@ -36,7 +36,6 @@ #include <linux/miscdevice.h> #include <linux/rhashtable.h> #include <linux/mutex.h> -#include <linux/idr.h> #include <linux/xarray.h> #include <linux/ratelimit.h> #include <linux/uaccess.h> @@ -317,7 +316,7 @@ struct dlm_rsb { int res_nodeid; int res_master_nodeid; int res_dir_nodeid; - int res_id; /* for ls_recover_idr */ + unsigned long res_id; /* for ls_recover_xa */ uint32_t res_lvbseq; uint32_t res_hash; unsigned long res_toss_time; @@ -649,8 +648,8 @@ struct dlm_ls { struct list_head ls_recover_list; spinlock_t ls_recover_list_lock; int ls_recover_list_count; - struct idr ls_recover_idr; - spinlock_t ls_recover_idr_lock; + struct xarray ls_recover_xa; + spinlock_t ls_recover_xa_lock; wait_queue_head_t ls_wait_general; wait_queue_head_t ls_recover_lock_wait; spinlock_t ls_clear_proc_locks; |