| g_raid_ctl.c (219974) | g_raid_ctl.c (234940) |
|---|---|
| 1/*- 2 * Copyright (c) 2010 Alexander Motin <mav@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) 2010 Alexander Motin <mav@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/raid/g_raid_ctl.c 219974 2011-03-24 21:31:32Z mav $"); | 28__FBSDID("$FreeBSD: head/sys/geom/raid/g_raid_ctl.c 234940 2012-05-03 05:32:56Z mav $"); |
| 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> --- 46 unchanged lines hidden (view full) --- 83 gctl_error(req, "Invalid number of arguments."); 84 return; 85 } 86 format = gctl_get_asciiparam(req, "arg0"); 87 if (format == NULL) { 88 gctl_error(req, "No format recieved."); 89 return; 90 } | 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> --- 46 unchanged lines hidden (view full) --- 83 gctl_error(req, "Invalid number of arguments."); 84 return; 85 } 86 format = gctl_get_asciiparam(req, "arg0"); 87 if (format == NULL) { 88 gctl_error(req, "No format recieved."); 89 return; 90 } |
| 91 crstatus = g_raid_create_node_format(format, &geom); | 91 crstatus = g_raid_create_node_format(format, req, &geom); |
| 92 if (crstatus == G_RAID_MD_TASTE_FAIL) { 93 gctl_error(req, "Failed to create array with format '%s'.", 94 format); 95 return; 96 } 97 sc = (struct g_raid_softc *)geom->softc; 98 g_topology_unlock(); 99 sx_xlock(&sc->sc_lock); --- 118 unchanged lines hidden --- | 92 if (crstatus == G_RAID_MD_TASTE_FAIL) { 93 gctl_error(req, "Failed to create array with format '%s'.", 94 format); 95 return; 96 } 97 sc = (struct g_raid_softc *)geom->softc; 98 g_topology_unlock(); 99 sx_xlock(&sc->sc_lock); --- 118 unchanged lines hidden --- |