| geom_disk.c (120374) | geom_disk.c (120572) |
|---|---|
| 1/*- 2 * Copyright (c) 2002 Poul-Henning Kamp 3 * Copyright (c) 2002 Networks Associates Technology, Inc. 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp 7 * and NAI Labs, the Security Research Division of Network Associates, Inc. 8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 20 unchanged lines hidden (view full) --- 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 */ 35 36#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2002 Poul-Henning Kamp 3 * Copyright (c) 2002 Networks Associates Technology, Inc. 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp 7 * and NAI Labs, the Security Research Division of Network Associates, Inc. 8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 20 unchanged lines hidden (view full) --- 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 */ 35 36#include <sys/cdefs.h> |
| 37__FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 120374 2003-09-23 07:53:59Z phk $"); | 37__FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 120572 2003-09-29 07:44:23Z phk $"); |
| 38 39#include "opt_geom.h" 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/kernel.h> 44#include <sys/sysctl.h> 45#include <sys/bio.h> --- 108 unchanged lines hidden (view full) --- 154 struct g_kerneldump *gkd; 155 struct dumperinfo di; 156 struct g_geom *gp; 157 158 gkd = (struct g_kerneldump*)bp->bio_data; 159 gp = bp->bio_to->geom; 160 g_trace(G_T_TOPOLOGY, "g_disk_kernedump(%s, %jd, %jd)", 161 gp->name, (intmax_t)gkd->offset, (intmax_t)gkd->length); | 38 39#include "opt_geom.h" 40 41#include <sys/param.h> 42#include <sys/systm.h> 43#include <sys/kernel.h> 44#include <sys/sysctl.h> 45#include <sys/bio.h> --- 108 unchanged lines hidden (view full) --- 154 struct g_kerneldump *gkd; 155 struct dumperinfo di; 156 struct g_geom *gp; 157 158 gkd = (struct g_kerneldump*)bp->bio_data; 159 gp = bp->bio_to->geom; 160 g_trace(G_T_TOPOLOGY, "g_disk_kernedump(%s, %jd, %jd)", 161 gp->name, (intmax_t)gkd->offset, (intmax_t)gkd->length); |
| 162 if (dp->d_dump == NULL) { 163 g_io_deliver(bp, ENODEV); 164 return; 165 } |
|
| 162 di.dumper = dp->d_dump; 163 di.priv = dp; 164 di.blocksize = dp->d_sectorsize; 165 di.mediaoffset = gkd->offset; 166 di.mediasize = gkd->length; 167 error = set_dumper(&di); 168 g_io_deliver(bp, error); 169} --- 261 unchanged lines hidden --- | 166 di.dumper = dp->d_dump; 167 di.priv = dp; 168 di.blocksize = dp->d_sectorsize; 169 di.mediaoffset = gkd->offset; 170 di.mediasize = gkd->length; 171 error = set_dumper(&di); 172 g_io_deliver(bp, error); 173} --- 261 unchanged lines hidden --- |