Deleted Added
full compact
geom_disk.c (196823) geom_disk.c (210471)
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 196823 2009-09-04 09:39:06Z pjd $");
37__FBSDID("$FreeBSD: head/sys/geom/geom_disk.c 210471 2010-07-25 15:43:52Z mav $");
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>

--- 254 unchanged lines hidden (view full) ---

300 if (g_handleattr_int(bp, "GEOM::fwsectors", dp->d_fwsectors))
301 break;
302 else if (g_handleattr_int(bp, "GEOM::fwheads", dp->d_fwheads))
303 break;
304 else if (g_handleattr_off_t(bp, "GEOM::frontstuff", 0))
305 break;
306 else if (g_handleattr_str(bp, "GEOM::ident", dp->d_ident))
307 break;
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>

--- 254 unchanged lines hidden (view full) ---

300 if (g_handleattr_int(bp, "GEOM::fwsectors", dp->d_fwsectors))
301 break;
302 else if (g_handleattr_int(bp, "GEOM::fwheads", dp->d_fwheads))
303 break;
304 else if (g_handleattr_off_t(bp, "GEOM::frontstuff", 0))
305 break;
306 else if (g_handleattr_str(bp, "GEOM::ident", dp->d_ident))
307 break;
308 else if (g_handleattr(bp, "GEOM::hba_vendor",
309 &dp->d_hba_vendor, 2))
310 break;
311 else if (g_handleattr(bp, "GEOM::hba_device",
312 &dp->d_hba_device, 2))
313 break;
314 else if (g_handleattr(bp, "GEOM::hba_subvendor",
315 &dp->d_hba_subvendor, 2))
316 break;
317 else if (g_handleattr(bp, "GEOM::hba_subdevice",
318 &dp->d_hba_subdevice, 2))
319 break;
308 else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump"))
309 g_disk_kerneldump(bp, dp);
310 else
311 error = ENOIOCTL;
312 break;
313 case BIO_FLUSH:
314 g_trace(G_T_TOPOLOGY, "g_disk_flushcache(%s)",
315 bp->bio_to->name);

--- 201 unchanged lines hidden ---
320 else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump"))
321 g_disk_kerneldump(bp, dp);
322 else
323 error = ENOIOCTL;
324 break;
325 case BIO_FLUSH:
326 g_trace(G_T_TOPOLOGY, "g_disk_flushcache(%s)",
327 bp->bio_to->name);

--- 201 unchanged lines hidden ---