Index: uspace/lib/device/include/hr.h
===================================================================
--- uspace/lib/device/include/hr.h	(revision e3e53cc1db1673f6fc3a0d1083490b9253ec3685)
+++ uspace/lib/device/include/hr.h	(revision de8110485425ef2ffd114ec22795252b57581d4c)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2024 Miroslav Cimerman
+ * Copyright (c) 2025 Miroslav Cimerman
  * All rights reserved.
  *
@@ -90,40 +90,38 @@
 
 typedef struct hr_config {
-	char devname[HR_DEVNAME_LEN];
-	service_id_t devs[HR_MAX_EXTENTS];
-	size_t dev_no;
-	hr_level_t level;
+	char		 devname[HR_DEVNAME_LEN];
+	service_id_t	 devs[HR_MAX_EXTENTS];
+	size_t		 dev_no;
+	hr_level_t	 level;
 } hr_config_t;
 
 typedef struct hr_extent {
-	service_id_t svc_id;
-	hr_ext_status_t status;
+	service_id_t	 svc_id;
+	hr_ext_status_t	 status;
 } hr_extent_t;
 
 typedef struct hr_vol_info {
-	hr_extent_t extents[HR_MAX_EXTENTS];
-	hr_extent_t hotspares[HR_MAX_HOTSPARES];
-	size_t extent_no;
-	size_t hotspare_no;
-	service_id_t svc_id;
-	hr_level_t level;
-	uint64_t nblocks;
-	uint32_t strip_size;
-	size_t bsize;
-	hr_vol_status_t status;
-	uint8_t layout;
+	hr_extent_t	 extents[HR_MAX_EXTENTS];
+	hr_extent_t	 hotspares[HR_MAX_HOTSPARES];
+	size_t		 extent_no;
+	size_t		 hotspare_no;
+	service_id_t	 svc_id;
+	hr_level_t	 level;
+	uint64_t	 nblocks;
+	uint32_t	 strip_size;
+	size_t		 bsize;
+	hr_vol_status_t	 status;
+	uint8_t		 layout;
 } hr_vol_info_t;
 
-extern errno_t hr_sess_init(hr_t **);
-extern void hr_sess_destroy(hr_t *);
-
-extern errno_t hr_create(hr_t *, hr_config_t *, bool);
-extern errno_t hr_stop(const char *, long);
-extern errno_t hr_add_hotspare(service_id_t, service_id_t);
-extern errno_t hr_print_status(void);
-
-extern const char *hr_get_vol_status_msg(hr_vol_status_t);
-extern const char *hr_get_ext_status_msg(hr_ext_status_t);
-extern const char *hr_get_layout_str(hr_level_t, uint8_t);
+extern errno_t		 hr_sess_init(hr_t **);
+extern void		 hr_sess_destroy(hr_t *);
+extern errno_t		 hr_create(hr_t *, hr_config_t *, bool);
+extern errno_t		 hr_stop(const char *, long);
+extern errno_t		 hr_add_hotspare(service_id_t, service_id_t);
+extern errno_t		 hr_print_status(void);
+extern const char	*hr_get_vol_status_msg(hr_vol_status_t);
+extern const char	*hr_get_ext_status_msg(hr_ext_status_t);
+extern const char	*hr_get_layout_str(hr_level_t, uint8_t);
 
 #endif
Index: uspace/srv/bd/hr/var.h
===================================================================
--- uspace/srv/bd/hr/var.h	(revision e3e53cc1db1673f6fc3a0d1083490b9253ec3685)
+++ uspace/srv/bd/hr/var.h	(revision de8110485425ef2ffd114ec22795252b57581d4c)
@@ -45,7 +45,6 @@
 #include "fge.h"
 
-#define NAME "hr"
-
-#define HR_STRIP_SIZE DATA_XFER_LIMIT
+#define NAME		"hr"
+#define HR_STRIP_SIZE	DATA_XFER_LIMIT
 
 struct hr_volume;
@@ -53,55 +52,51 @@
 
 typedef struct hr_ops {
-	errno_t (*create)(hr_volume_t *);
-	errno_t (*init)(hr_volume_t *);
-	void	(*status_event)(hr_volume_t *);
-	errno_t	(*add_hotspare)(hr_volume_t *, service_id_t);
+	errno_t		(*create)(hr_volume_t *);
+	errno_t		(*init)(hr_volume_t *);
+	void		(*status_event)(hr_volume_t *);
+	errno_t		(*add_hotspare)(hr_volume_t *, service_id_t);
 } hr_ops_t;
 
 typedef struct hr_volume {
-	hr_ops_t hr_ops;
-	bd_srvs_t hr_bds;
+	link_t		 lvolumes;		/* link to all volumes list */
+	hr_ops_t	 hr_ops;		/* level init and create fcns */
+	bd_srvs_t	 hr_bds;		/* block interface to the vol */
+	service_id_t	 svc_id;		/* service id */
 
-	link_t lvolumes; /* protected by static hr_volumes_lock in hr.c */
+	fibril_mutex_t	 lock;			/* XXX: gone after para */
+	list_t		 range_lock_list;	/* list of range locks */
+	fibril_mutex_t	 range_lock_list_lock;	/* range locks list lock */
+	hr_fpool_t	*fge;			/* fibril pool */
 
-	/*
-	 * XXX: will be gone after all paralelization, but still used
-	 * in yet-unparallelized levels
+	/* invariants */
+	size_t		 extent_no;		/* number of extents */
+	size_t		 bsize;			/* block size */
+	uint64_t	 nblocks;		/* no. of all usable blocks */
+	uint64_t	 data_blkno;		/* no. of user usable blocks */
+	uint64_t	 data_offset;		/* user data offset in blocks */
+	uint32_t	 strip_size;		/* strip size */
+	hr_level_t	 level;			/* volume level */
+	uint8_t		 layout;		/* RAID Level Qualifier */
+	char		 devname[HR_DEVNAME_LEN];
+
+	hr_extent_t	 extents[HR_MAX_EXTENTS];
+	fibril_rwlock_t	 extents_lock;		/* extent service id lock */
+
+	size_t		 hotspare_no;		/* no. of available hotspares */
+	hr_extent_t	 hotspares[HR_MAX_HOTSPARES + HR_MAX_EXTENTS];
+	fibril_mutex_t	 hotspare_lock;		/* lock protecting hotspares */
+
+	fibril_rwlock_t	 states_lock;		/* states lock */
+
+	_Atomic bool	 state_dirty;		/* dirty state */
+
+	/* XXX: unportable for 32-bit?
+	 *
+	 * Add macros for locking or atomic increment depending
+	 * on the platform?
 	 */
-	fibril_mutex_t lock;
-
-	list_t range_lock_list;
-	fibril_mutex_t range_lock_list_lock;
-
-	hr_fpool_t *fge;
-
-	/* after assembly, these are invariant */
-	size_t extent_no;
-	size_t bsize;
-	uint64_t nblocks;
-	uint64_t data_blkno;
-	uint64_t data_offset; /* in blocks */
-	uint32_t strip_size;
-	hr_level_t level;
-	uint8_t layout; /* RAID Level Qualifier */
-	service_id_t svc_id;
-	char devname[HR_DEVNAME_LEN];
-
-	size_t hotspare_no;
-	hr_extent_t hotspares[HR_MAX_HOTSPARES + HR_MAX_EXTENTS];
-
-	/* protects hotspares (hotspares.{svc_id,status}, hotspare_no) */
-	fibril_mutex_t hotspare_lock;
-
-	hr_extent_t extents[HR_MAX_EXTENTS];
-	/* protects extents ordering (extents.svc_id) */
-	fibril_rwlock_t extents_lock;
-	/* protects states (extents.status, hr_volume_t.status) */
-	fibril_rwlock_t states_lock;
-
-	_Atomic bool state_dirty;
-	_Atomic uint64_t rebuild_blk;
-	uint64_t counter; /* metadata syncing */
-	hr_vol_status_t status;
+	_Atomic uint64_t rebuild_blk;		/* rebuild position */
+	uint64_t	 counter;		/* TODO: metadata syncing */
+	hr_vol_status_t	 status;		/* volume status */
 } hr_volume_t;
 
@@ -113,30 +108,31 @@
 
 typedef struct hr_range_lock {
-	fibril_mutex_t lock;
-	link_t link;
-	hr_volume_t *vol;
-	uint64_t off;
-	uint64_t len;
-	size_t pending; /* protected by vol->range_lock_list_lock */
-	bool ignore; /* protected by vol->range_lock_list_lock */
+	link_t		 link;
+	fibril_mutex_t	 lock;
+	hr_volume_t	*vol;		/* back-pointer to volume */
+	uint64_t	 off;		/* start of the range */
+	uint64_t	 len;		/* length of the range */
+
+	size_t		 pending;	/* prot. by vol->range_lock_list_lock */
+	bool		 ignore;	/* prot. by vol->range_lock_list_lock */
 } hr_range_lock_t;
 
-extern errno_t hr_init_devs(hr_volume_t *);
-extern void hr_fini_devs(hr_volume_t *);
+extern errno_t		hr_init_devs(hr_volume_t *);
+extern void		hr_fini_devs(hr_volume_t *);
 
-extern errno_t hr_raid0_create(hr_volume_t *);
-extern errno_t hr_raid1_create(hr_volume_t *);
-extern errno_t hr_raid5_create(hr_volume_t *);
+extern errno_t		hr_raid0_create(hr_volume_t *);
+extern errno_t 		hr_raid1_create(hr_volume_t *);
+extern errno_t 		hr_raid5_create(hr_volume_t *);
 
-extern errno_t hr_raid0_init(hr_volume_t *);
-extern errno_t hr_raid1_init(hr_volume_t *);
-extern errno_t hr_raid5_init(hr_volume_t *);
+extern errno_t		hr_raid0_init(hr_volume_t *);
+extern errno_t 		hr_raid1_init(hr_volume_t *);
+extern errno_t 		hr_raid5_init(hr_volume_t *);
 
-extern void hr_raid0_status_event(hr_volume_t *);
-extern void hr_raid1_status_event(hr_volume_t *);
-extern void hr_raid5_status_event(hr_volume_t *);
+extern void		hr_raid0_status_event(hr_volume_t *);
+extern void		hr_raid1_status_event(hr_volume_t *);
+extern void		hr_raid5_status_event(hr_volume_t *);
 
-extern errno_t hr_raid1_add_hotspare(hr_volume_t *, service_id_t);
-extern errno_t hr_raid5_add_hotspare(hr_volume_t *, service_id_t);
+extern errno_t		hr_raid1_add_hotspare(hr_volume_t *, service_id_t);
+extern errno_t		hr_raid5_add_hotspare(hr_volume_t *, service_id_t);
 
 #endif