g_eli_ctl.c (162353) | g_eli_ctl.c (162834) |
---|---|
1/*- 2 * Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
28__FBSDID("$FreeBSD: head/sys/geom/eli/g_eli_ctl.c 162353 2006-09-16 10:43:17Z pjd $"); | 28__FBSDID("$FreeBSD: head/sys/geom/eli/g_eli_ctl.c 162834 2006-09-30 08:16:49Z pjd $"); |
29 30#include <sys/param.h> 31#include <sys/systm.h> 32#include <sys/kernel.h> 33#include <sys/module.h> 34#include <sys/lock.h> 35#include <sys/mutex.h> 36#include <sys/bio.h> --- 596 unchanged lines hidden (view full) --- 633 mkeydst = md.md_mkeys; 634 keysize = sizeof(md.md_mkeys); 635 } else { 636 force = gctl_get_paraml(req, "force", sizeof(*force)); 637 if (force == NULL) { 638 gctl_error(req, "No '%s' argument.", "force"); 639 return; 640 } | 29 30#include <sys/param.h> 31#include <sys/systm.h> 32#include <sys/kernel.h> 33#include <sys/module.h> 34#include <sys/lock.h> 35#include <sys/mutex.h> 36#include <sys/bio.h> --- 596 unchanged lines hidden (view full) --- 633 mkeydst = md.md_mkeys; 634 keysize = sizeof(md.md_mkeys); 635 } else { 636 force = gctl_get_paraml(req, "force", sizeof(*force)); 637 if (force == NULL) { 638 gctl_error(req, "No '%s' argument.", "force"); 639 return; 640 } |
641 | 641 |
642 valp = gctl_get_paraml(req, "keyno", sizeof(*valp)); 643 if (valp == NULL) { 644 gctl_error(req, "No '%s' argument.", "keyno"); 645 return; 646 } 647 if (*valp != -1) 648 nkey = *valp; 649 else --- 183 unchanged lines hidden --- | 642 valp = gctl_get_paraml(req, "keyno", sizeof(*valp)); 643 if (valp == NULL) { 644 gctl_error(req, "No '%s' argument.", "keyno"); 645 return; 646 } 647 if (*valp != -1) 648 nkey = *valp; 649 else --- 183 unchanged lines hidden --- |