diff options
| author | John Sonnenschein <johns@joyent.com> | 2011-10-03 21:04:40 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2011-10-03 21:04:40 +0000 |
| commit | 4171a80dc48c62297457d0820f26cac6516e068a (patch) | |
| tree | 5e20c8b91e74482baeed81d9cda1af2f63207b82 /usr/src/uts/common/sys/blkdev.h | |
| parent | cb866ae1d95a57b3ac6bf38040e40ed0cd4fe835 (diff) | |
| parent | ed22c7109fc5dd9e1b7a5d0333bdc7ad2718e2ab (diff) | |
| download | illumos-joyent-4171a80dc48c62297457d0820f26cac6516e068a.tar.gz | |
[OS-663] Post-6.5 Illumos sync
Merge https://github.com/illumos/illumos-gate
Conflicts:
exception_lists/packaging
usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl
usr/src/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.include.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
usr/src/cmd/lp/Makefile
usr/src/cmd/lp/cmd/lpadmin/options.c
usr/src/cmd/lp/cmd/lpfilter.c
usr/src/cmd/lp/cmd/lpforms.c
usr/src/cmd/lp/cmd/lpusers.c
usr/src/cmd/lp/lib/lp/isterminfo.c
usr/src/cmd/lp/lib/lp/tidbit.c
usr/src/cmd/terminfo/att.ti
usr/src/cmd/zpool/zpool_main.c
usr/src/common/dis/i386/dis_tables.c
usr/src/lib/libdtrace/common/dt_options.c
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/man/man1m/dladm.1m
usr/src/man/man1m/flowadm.1m
usr/src/man/man1m/zoneadm.1m
usr/src/man/man1m/zonecfg.1m
usr/src/pkg/manifests/print-lp-print-client-commands.mf
usr/src/pkg/manifests/print-lp.mf
usr/src/uts/common/fs/zfs/sys/zio.h
usr/src/uts/common/fs/zfs/zio.c
usr/src/uts/i86pc/ml/mach_offsets.in
usr/src/uts/intel/amd64/ml/mach_offsets.in
usr/src/uts/intel/sys/tss.h
Diffstat (limited to 'usr/src/uts/common/sys/blkdev.h')
| -rw-r--r-- | usr/src/uts/common/sys/blkdev.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr/src/uts/common/sys/blkdev.h b/usr/src/uts/common/sys/blkdev.h index 0ecfbb4827..2307610bae 100644 --- a/usr/src/uts/common/sys/blkdev.h +++ b/usr/src/uts/common/sys/blkdev.h @@ -19,6 +19,7 @@ * CDDL HEADER END */ /* + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -40,9 +41,7 @@ extern "C" { * but do not need all the capabilities of SCSA. So we make quite a few * simplifications: * - * 1) Device block size is fixed at 512 bytes. (Devices with larger - * block sizes can still operate, but will need to support some - * form of read-modify-write, and will take a performance penalty.) + * 1) Device block size is a multiple of 512 bytes. * * 2) Non-rotating media. We assume a simple linear layout. * @@ -89,6 +88,7 @@ struct bd_xfer { ddi_dma_cookie_t x_dmac; unsigned x_ndmac; caddr_t x_kaddr; + unsigned x_flags; }; #define BD_XFER_POLL (1U << 0) /* no interrupts (dump) */ @@ -130,7 +130,6 @@ struct bd_ops { int (*o_sync_cache)(void *, bd_xfer_t *); int (*o_read)(void *, bd_xfer_t *); int (*o_write)(void *, bd_xfer_t *); - int (*o_dump)(void *, bd_xfer_t *); }; #define BD_OPS_VERSION_0 0 |