View | Details | Raw Unified | Return to bug 209113
Collapse All | Expand All

(-)b/sys/geom/geom.h (-1 / +1 lines)
Lines 347-353 struct g_kerneldump { Link Here
347
MALLOC_DECLARE(M_GEOM);
347
MALLOC_DECLARE(M_GEOM);
348
348
349
static __inline void *
349
static __inline void *
350
g_malloc(int size, int flags)
350
g_malloc(size_t size, int flags)
351
{
351
{
352
	void *p;
352
	void *p;
353
353
(-)b/sys/geom/geom_ctl.c (-1 / +4 lines)
Lines 122-128 geom_alloc_copyin(struct gctl_req *req, void *uaddr, size_t len) Link Here
122
{
122
{
123
	void *ptr;
123
	void *ptr;
124
124
125
	ptr = g_malloc(len, M_WAITOK);
125
	ptr = g_malloc(len, M_NOWAIT);
126
	if (ptr==NULL)
127
		return (NULL);
128
126
	req->nerror = copyin(uaddr, ptr, len);
129
	req->nerror = copyin(uaddr, ptr, len);
127
	if (!req->nerror)
130
	if (!req->nerror)
128
		return (ptr);
131
		return (ptr);

Return to bug 209113