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

dm: Unbreak compilation of kernel modules

Browse Source 
The dm kernel modules (MK_DM_TARGETS enabled in sys/modules/dm/Makefile)
have been broken. Unbreak the build.
This commit is contained in:
tkusumi 2019-12-08 10:35:53 +00:00
parent 05f01df798
commit 1c486dc61c
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: dm.h,v 1.35 2019/12/08 04:41:02 tkusumi Exp $ */
/* $NetBSD: dm.h,v 1.36 2019/12/08 10:35:53 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -265,7 +265,7 @@ int dm_target_destroy(void);
int dm_target_insert(dm_target_t *);
prop_array_t dm_target_prop_list(void);
dm_target_t* dm_target_lookup(const char *);
int dm_target_rem(char *);
int dm_target_rem(const char *);
void dm_target_unbusy(dm_target_t *);
void dm_target_busy(dm_target_t *);

6
sys/dev/dm/dm_target.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dm_target.c,v 1.25 2019/12/07 15:28:39 tkusumi Exp $ */
/* $NetBSD: dm_target.c,v 1.26 2019/12/08 10:35:53 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_target.c,v 1.25 2019/12/07 15:28:39 tkusumi Exp $");
__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.26 2019/12/08 10:35:53 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -183,7 +183,7 @@ dm_target_insert(dm_target_t *dm_target)
* Remove target from TAIL, target is selected with its name.
*/
int
dm_target_rem(char *dm_target_name)
dm_target_rem(const char *dm_target_name)
{
dm_target_t *dmt;

9
sys/dev/dm/dm_target_snapshot.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dm_target_snapshot.c,v 1.26 2019/12/08 04:41:02 tkusumi Exp $ */
/* $NetBSD: dm_target_snapshot.c,v 1.27 2019/12/08 10:35:53 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_target_snapshot.c,v 1.26 2019/12/08 04:41:02 tkusumi Exp $");
__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.27 2019/12/08 10:35:53 tkusumi Exp $");
/*
* 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@ -240,8 +240,6 @@ dm_target_snapshot_init(dm_table_entry_t *table_en, char *params)
table_en->target_config = tsc;
dmv->sec_size = dmp_snap->dmp_secsize;
return 0;
}
@ -258,14 +256,13 @@ dm_target_snapshot_status(void *target_config)
uint32_t i;
uint32_t count;
size_t prm_len, cow_len;
char *params, *cow_name;
char *params;
tsc = target_config;
prm_len = 0;
cow_len = 0;
count = 0;
cow_name = NULL;
printf("Snapshot target status function called\n");