Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: Don't try to implement "status" as subset of "table"

Browse Source 
The way dm_table_status_ioctl() implements "status" and "table" is
not compatible with Linux kernel. Some targets have different outputs
that "status" can't be implemented as subset of "table".

Add ->info() handler to sync with "status" behavior in Linux kernel.
Some targets which currently exist in NetBSD (I think striped)
as well as some minor targets that I plan to port to NetBSD
can/should implement ->info(), but will do that in a different commit.

taken-from: DragonFlyBSD
This commit is contained in:
tkusumi 2019-12-14 17:15:54 +00:00
parent ddbcef3d72
commit 47e84ce6c8
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/dm/dm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: dm.h,v 1.40 2019/12/14 11:20:51 tkusumi Exp $ */
/* $NetBSD: dm.h,v 1.41 2019/12/14 17:15:54 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -184,10 +184,11 @@ typedef struct dm_target {
int (*deps) (dm_table_entry_t *, prop_array_t);
/*
* Status routine is called to get params string, which is target
* Info/status routine are called to get params string, which is target
* specific. When dm_table_status_ioctl is called with flag
* DM_STATUS_TABLE_FLAG I have to sent params string back.
*/
char *(*info)(void *);
char * (*status)(void *);
int (*strategy)(dm_table_entry_t *, struct buf *);
int (*sync)(dm_table_entry_t *);

26
sys/dev/dm/dm_ioctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dm_ioctl.c,v 1.43 2019/12/14 14:43:38 tkusumi Exp $ */
/* $NetBSD: dm_ioctl.c,v 1.44 2019/12/14 17:15:54 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.43 2019/12/14 14:43:38 tkusumi Exp $");
__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.44 2019/12/14 17:15:54 tkusumi Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@ -942,17 +942,21 @@ dm_table_status_ioctl(prop_dictionary_t dm_dict)
*/
prop_dictionary_set_cstring(target_dict, DM_TABLE_PARAMS, "");
if (flags & DM_STATUS_TABLE_FLAG) {
params = table_en->target->status
(table_en->target_config);
if (flags & DM_STATUS_TABLE_FLAG)
params = table_en->target->status(
table_en->target_config);
else if (table_en->target->info)
params = table_en->target->info(
table_en->target_config);
else
params = NULL;
if (params != NULL) {
prop_dictionary_set_cstring(target_dict,
DM_TABLE_PARAMS, params);
kmem_free(params, DM_MAX_PARAMS_SIZE);
}
if (params != NULL) {
prop_dictionary_set_cstring(target_dict,
DM_TABLE_PARAMS, params);
kmem_free(params, DM_MAX_PARAMS_SIZE);
}
prop_array_add(cmd_array, target_dict);
prop_object_release(target_dict);
}