Date: Tue, 25 Jun 2013 20:29:32 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 230147 for review Message-ID: <201306252029.r5PKTWpD087567@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@230147?ac=10 Change 230147 by jhb@jhb_jhbbsd on 2013/06/25 20:28:30 IFC @230144 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#36 integrate .. //depot/projects/smpng/share/man/man9/hhook.9#5 integrate .. //depot/projects/smpng/share/man/man9/rmlock.9#9 integrate .. //depot/projects/smpng/share/man/man9/rwlock.9#6 integrate .. //depot/projects/smpng/sys/amd64/include/counter.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#43 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#29 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mutex.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#18 integrate .. //depot/projects/smpng/sys/conf/files#285 integrate .. //depot/projects/smpng/sys/conf/files.amd64#95 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#21 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#44 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#133 integrate .. //depot/projects/smpng/sys/dev/qlxge/README.txt#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_dbg.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_dbg.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_def.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_dump.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_dump.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_glbl.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_hw.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_hw.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_inline.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_ioctl.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_ioctl.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_isr.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_os.c#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_os.h#1 branch .. //depot/projects/smpng/sys/dev/qlxge/qls_ver.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umcs.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#180 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtwn.c#2 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_alloc.c#11 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_balloc.c#7 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_bmap.c#7 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_extern.h#5 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_subr.c#6 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2fs.h#9 integrate .. //depot/projects/smpng/sys/fs/ext2fs/fs.h#6 integrate .. //depot/projects/smpng/sys/fs/ext2fs/inode.h#9 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#21 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clstate.c#21 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#22 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#29 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_cpuset.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_rmlock.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#23 integrate .. //depot/projects/smpng/sys/modules/Makefile#196 integrate .. //depot/projects/smpng/sys/modules/qlxge/Makefile#1 branch .. //depot/projects/smpng/sys/modules/runfw/Makefile#3 integrate .. //depot/projects/smpng/sys/net/route.h#44 integrate .. //depot/projects/smpng/sys/net/rtsock.c#92 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#126 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#152 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#110 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#75 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#36 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#52 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#49 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#73 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.h#7 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#69 integrate .. //depot/projects/smpng/sys/netipsec/ah_var.h#6 integrate .. //depot/projects/smpng/sys/netipsec/esp_var.h#6 integrate .. //depot/projects/smpng/sys/netipsec/ipcomp_var.h#7 integrate .. //depot/projects/smpng/sys/netipsec/ipip_var.h#7 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#44 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#25 integrate .. //depot/projects/smpng/sys/netipsec/ipsec6.h#12 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#31 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#19 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#30 integrate .. //depot/projects/smpng/sys/netipsec/key.c#56 integrate .. //depot/projects/smpng/sys/netipsec/keysock.c#27 integrate .. //depot/projects/smpng/sys/netipsec/keysock.h#7 integrate .. //depot/projects/smpng/sys/netipsec/xform_ah.c#24 integrate .. //depot/projects/smpng/sys/netipsec/xform_esp.c#28 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipcomp.c#21 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#32 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_cpu.c#4 integrate .. //depot/projects/smpng/sys/sys/_rmlock.h#6 integrate .. //depot/projects/smpng/sys/sys/cpuset.h#12 integrate .. //depot/projects/smpng/sys/sys/lock.h#61 integrate .. //depot/projects/smpng/sys/sys/rmlock.h#7 integrate .. //depot/projects/smpng/sys/vm/uma.h#33 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#97 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.c#20 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#41 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#135 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/man/man9/Makefile 251825 2013-06-17 03:32:27Z delphij $ +# $FreeBSD: head/share/man/man9/Makefile 252209 2013-06-25 18:44:15Z jhb $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1084,6 +1084,7 @@ MLINKS+=rmlock.9 rm_assert.9 \ rmlock.9 rm_destroy.9 \ rmlock.9 rm_init.9 \ + rmlock.9 rm_init_flags.9 \ rmlock.9 rm_rlock.9 \ rmlock.9 rm_runlock.9 \ rmlock.9 rm_sleep.9 \ ==== //depot/projects/smpng/share/man/man9/hhook.9#5 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/hhook.9 222286 2011-05-25 14:13:53Z ru $ +.\" $FreeBSD: head/share/man/man9/hhook.9 252052 2013-06-21 03:37:35Z lstewart $ .\" -.Dd February 15, 2011 +.Dd June 21, 2013 .Dt HHOOK 9 .Os .Sh NAME @@ -380,9 +380,3 @@ .An David Hayes Aq david.hayes@ieee.org and .An Lawrence Stewart Aq lstewart@FreeBSD.org . -.Sh BUGS -The framework does not currently support registering hook points in subsystems -which have not been virtualised with VIMAGE. -Fairly minimal internal changes to the -.Nm -implementation are required to address this. ==== //depot/projects/smpng/share/man/man9/rmlock.9#9 (text+ko) ==== @@ -23,10 +23,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/rmlock.9 236768 2012-06-08 21:30:35Z jhb $ +.\" $FreeBSD: head/share/man/man9/rmlock.9 252209 2013-06-25 18:44:15Z jhb $ .\" .\" Based on rwlock.9 man page -.Dd June 8, 2012 +.Dd June 25, 2013 .Dt RMLOCK 9 .Os .Sh NAME ==== //depot/projects/smpng/share/man/man9/rwlock.9#6 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/rwlock.9 236680 2012-06-06 13:35:30Z jhb $ +.\" $FreeBSD: head/share/man/man9/rwlock.9 252037 2013-06-20 17:26:25Z jhb $ .\" -.Dd November 16, 2011 +.Dd June 20, 2013 .Dt RWLOCK 9 .Os .Sh NAME ==== //depot/projects/smpng/sys/amd64/include/counter.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/counter.h 249268 2013-04-08 19:40:53Z glebius $ + * $FreeBSD: head/sys/amd64/include/counter.h 252032 2013-06-20 14:30:04Z kib $ */ #ifndef __MACHINE_COUNTER_H__ @@ -44,7 +44,7 @@ __asm __volatile("addq\t%1,%%gs:(%0)" : - : "r" ((char *)c - (char *)&__pcpu[0]), "r" (inc) + : "r" ((char *)c - (char *)&__pcpu[0]), "ri" (inc) : "memory", "cc"); } ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.c#43 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_all.c 251654 2013-06-12 13:36:20Z mav $"); +__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_all.c 252204 2013-06-25 10:50:17Z mav $"); #include <sys/param.h> #include <sys/types.h> @@ -737,6 +737,172 @@ "Logical unit not ready, cause not reportable") } }; +static struct asc_table_entry hgst_entries[] = { + { SST(0x04, 0xF0, SS_RDEF, + "Vendor Unique - Logical Unit Not Ready") }, + { SST(0x0A, 0x01, SS_RDEF, + "Unrecovered Super Certification Log Write Error") }, + { SST(0x0A, 0x02, SS_RDEF, + "Unrecovered Super Certification Log Read Error") }, + { SST(0x15, 0x03, SS_RDEF, + "Unrecovered Sector Error") }, + { SST(0x3E, 0x04, SS_RDEF, + "Unrecovered Self-Test Hard-Cache Test Fail") }, + { SST(0x3E, 0x05, SS_RDEF, + "Unrecovered Self-Test OTF-Cache Fail") }, + { SST(0x40, 0x00, SS_RDEF, + "Unrecovered SAT No Buffer Overflow Error") }, + { SST(0x40, 0x01, SS_RDEF, + "Unrecovered SAT Buffer Overflow Error") }, + { SST(0x40, 0x02, SS_RDEF, + "Unrecovered SAT No Buffer Overflow With ECS Fault") }, + { SST(0x40, 0x03, SS_RDEF, + "Unrecovered SAT Buffer Overflow With ECS Fault") }, + { SST(0x40, 0x81, SS_RDEF, + "DRAM Failure") }, + { SST(0x44, 0x0B, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xF2, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xF6, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xF9, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x44, 0xFA, SS_RDEF, + "Vendor Unique - Internal Target Failure") }, + { SST(0x5D, 0x22, SS_RDEF, + "Extreme Over-Temperature Warning") }, + { SST(0x5D, 0x50, SS_RDEF, + "Load/Unload cycle Count Warning") }, + { SST(0x81, 0x00, SS_RDEF, + "Vendor Unique - Internal Logic Error") }, + { SST(0x85, 0x00, SS_RDEF, + "Vendor Unique - Internal Key Seed Error") }, +}; + +static struct asc_table_entry seagate_entries[] = { + { SST(0x04, 0xF0, SS_RDEF, + "Logical Unit Not Ready, super certify in Progress") }, + { SST(0x08, 0x86, SS_RDEF, + "Write Fault Data Corruption") }, + { SST(0x09, 0x0D, SS_RDEF, + "Tracking Failure") }, + { SST(0x09, 0x0E, SS_RDEF, + "ETF Failure") }, + { SST(0x0B, 0x5D, SS_RDEF, + "Pre-SMART Warning") }, + { SST(0x0B, 0x85, SS_RDEF, + "5V Voltage Warning") }, + { SST(0x0B, 0x8C, SS_RDEF, + "12V Voltage Warning") }, + { SST(0x0C, 0xFF, SS_RDEF, + "Write Error – Too many error recovery revs") }, + { SST(0x11, 0xFF, SS_RDEF, + "Unrecovered Read Error – Too many error recovery revs") }, + { SST(0x19, 0x0E, SS_RDEF, + "Fewer than 1/2 defect list copies") }, + { SST(0x20, 0xF3, SS_RDEF, + "Illegal CDB linked to skip mask cmd") }, + { SST(0x24, 0xF0, SS_RDEF, + "Illegal byte in CDB, LBA not matching") }, + { SST(0x24, 0xF1, SS_RDEF, + "Illegal byte in CDB, LEN not matching") }, + { SST(0x24, 0xF2, SS_RDEF, + "Mask not matching transfer length") }, + { SST(0x24, 0xF3, SS_RDEF, + "Drive formatted without plist") }, + { SST(0x26, 0x95, SS_RDEF, + "Invalid Field Parameter – CAP File") }, + { SST(0x26, 0x96, SS_RDEF, + "Invalid Field Parameter – RAP File") }, + { SST(0x26, 0x97, SS_RDEF, + "Invalid Field Parameter – TMS Firmware Tag") }, + { SST(0x26, 0x98, SS_RDEF, + "Invalid Field Parameter – Check Sum") }, + { SST(0x26, 0x99, SS_RDEF, + "Invalid Field Parameter – Firmware Tag") }, + { SST(0x29, 0x08, SS_RDEF, + "Write Log Dump data") }, + { SST(0x29, 0x09, SS_RDEF, + "Write Log Dump data") }, + { SST(0x29, 0x0A, SS_RDEF, + "Reserved disk space") }, + { SST(0x29, 0x0B, SS_RDEF, + "SDBP") }, + { SST(0x29, 0x0C, SS_RDEF, + "SDBP") }, + { SST(0x31, 0x91, SS_RDEF, + "Format Corrupted World Wide Name (WWN) is Invalid") }, + { SST(0x32, 0x03, SS_RDEF, + "Defect List – Length exceeds Command Allocated Length") }, + { SST(0x33, 0x00, SS_RDEF, + "Flash not ready for access") }, + { SST(0x3F, 0x70, SS_RDEF, + "Invalid RAP block") }, + { SST(0x3F, 0x71, SS_RDEF, + "RAP/ETF mismatch") }, + { SST(0x3F, 0x90, SS_RDEF, + "Invalid CAP block") }, + { SST(0x3F, 0x91, SS_RDEF, + "World Wide Name (WWN) Mismatch") }, + { SST(0x40, 0x01, SS_RDEF, + "DRAM Parity Error") }, + { SST(0x40, 0x02, SS_RDEF, + "DRAM Parity Error") }, + { SST(0x42, 0x0A, SS_RDEF, + "Loopback Test") }, + { SST(0x42, 0x0B, SS_RDEF, + "Loopback Test") }, + { SST(0x44, 0xF2, SS_RDEF, + "Compare error during data integrity check") }, + { SST(0x44, 0xF6, SS_RDEF, + "Unrecoverable error during data integrity check") }, + { SST(0x47, 0x80, SS_RDEF, + "Fibre Channel Sequence Error") }, + { SST(0x4E, 0x01, SS_RDEF, + "Information Unit Too Short") }, + { SST(0x80, 0x00, SS_RDEF, + "General Firmware Error / Command Timeout") }, + { SST(0x80, 0x01, SS_RDEF, + "Command Timeout") }, + { SST(0x80, 0x02, SS_RDEF, + "Command Timeout") }, + { SST(0x80, 0x80, SS_RDEF, + "FC FIFO Error During Read Transfer") }, + { SST(0x80, 0x81, SS_RDEF, + "FC FIFO Error During Write Transfer") }, + { SST(0x80, 0x82, SS_RDEF, + "DISC FIFO Error During Read Transfer") }, + { SST(0x80, 0x83, SS_RDEF, + "DISC FIFO Error During Write Transfer") }, + { SST(0x80, 0x84, SS_RDEF, + "LBA Seeded LRC Error on Read") }, + { SST(0x80, 0x85, SS_RDEF, + "LBA Seeded LRC Error on Write") }, + { SST(0x80, 0x86, SS_RDEF, + "IOEDC Error on Read") }, + { SST(0x80, 0x87, SS_RDEF, + "IOEDC Error on Write") }, + { SST(0x80, 0x88, SS_RDEF, + "Host Parity Check Failed") }, + { SST(0x80, 0x89, SS_RDEF, + "IOEDC error on read detected by formatter") }, + { SST(0x80, 0x8A, SS_RDEF, + "Host Parity Errors / Host FIFO Initialization Failed") }, + { SST(0x80, 0x8B, SS_RDEF, + "Host Parity Errors") }, + { SST(0x80, 0x8C, SS_RDEF, + "Host Parity Errors") }, + { SST(0x80, 0x8D, SS_RDEF, + "Host Parity Errors") }, + { SST(0x81, 0x00, SS_RDEF, + "LA Check Failed") }, + { SST(0x82, 0x00, SS_RDEF, + "Internal client detected insufficient buffer") }, + { SST(0x84, 0x00, SS_RDEF, + "Scheduled Diagnostic And Repair") }, +}; + static struct scsi_sense_quirk_entry sense_quirk_table[] = { { /* @@ -759,6 +925,26 @@ sizeof(sony_mo_entries)/sizeof(struct asc_table_entry), /*sense key entries*/NULL, sony_mo_entries + }, + { + /* + * HGST vendor-specific error codes + */ + {T_DIRECT, SIP_MEDIA_FIXED, "HGST", "*", "*"}, + /*num_sense_keys*/0, + sizeof(hgst_entries)/sizeof(struct asc_table_entry), + /*sense key entries*/NULL, + hgst_entries + }, + { + /* + * SEAGATE vendor-specific error codes + */ + {T_DIRECT, SIP_MEDIA_FIXED, "SEAGATE", "*", "*"}, + /*num_sense_keys*/0, + sizeof(seagate_entries)/sizeof(struct asc_table_entry), + /*sense key entries*/NULL, + seagate_entries } }; ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.h#29 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: head/sys/cam/scsi/scsi_all.h 251654 2013-06-12 13:36:20Z mav $ + * $FreeBSD: head/sys/cam/scsi/scsi_all.h 252045 2013-06-20 21:38:08Z smh $ */ /* @@ -917,10 +917,10 @@ #define AP_PROTO_DMA_QUEUED (0x07 << 1) #define AP_PROTO_DEVICE_DIAG (0x08 << 1) #define AP_PROTO_DEVICE_RESET (0x09 << 1) -#define AP_PROTO_UDMA_IN (0x10 << 1) -#define AP_PROTO_UDMA_OUT (0x11 << 1) -#define AP_PROTO_FPDMA (0x12 << 1) -#define AP_PROTO_RESP_INFO (0x15 << 1) +#define AP_PROTO_UDMA_IN (0x0a << 1) +#define AP_PROTO_UDMA_OUT (0x0b << 1) +#define AP_PROTO_FPDMA (0x0c << 1) +#define AP_PROTO_RESP_INFO (0x0f << 1) #define AP_MULTI 0xe0 u_int8_t flags; #define AP_T_LEN 0x03 ==== //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/mutex.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/cddl/compat/opensolaris/sys/mutex.h 219089 2011-02-27 19:41:40Z pjd $ + * $FreeBSD: head/sys/cddl/compat/opensolaris/sys/mutex.h 252061 2013-06-21 15:55:03Z smh $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -71,8 +71,7 @@ #define mutex_tryenter(lock) sx_try_xlock(lock) #define mutex_exit(lock) sx_xunlock(lock) #define mutex_owned(lock) sx_xlocked(lock) -/* TODO: Change to sx_xholder() once it is moved from kern_sx.c to sx.h. */ -#define mutex_owner(lock) ((lock)->sx_lock & SX_LOCK_SHARED ? NULL : (struct thread *)SX_OWNER((lock)->sx_lock)) +#define mutex_owner(lock) sx_xholder(lock) #endif /* _KERNEL */ ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#15 (text+ko) ==== @@ -1836,6 +1836,7 @@ vdev_config_dirty(vd->vdev_top); } + bzero(&smlock, sizeof (smlock)); mutex_init(&smlock, NULL, MUTEX_DEFAULT, NULL); space_map_create(&smsync, sm->sm_start, sm->sm_size, sm->sm_shift, ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#18 (text+ko) ==== @@ -270,8 +270,7 @@ continue; if (nvlist_lookup_uint64(*config, ZPOOL_CONFIG_POOL_STATE, - &state) != 0 || state == POOL_STATE_DESTROYED || - state > POOL_STATE_L2CACHE) { + &state) != 0 || state > POOL_STATE_L2CACHE) { nvlist_free(*config); *config = NULL; continue; ==== //depot/projects/smpng/sys/conf/files#285 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/conf/files 251964 2013-06-18 21:28:19Z jfv $ +# $FreeBSD: head/sys/conf/files 252064 2013-06-21 18:16:54Z gonzo $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2284,19 +2284,19 @@ dev/usb/wlan/if_rum.c optional rum dev/usb/wlan/if_run.c optional run runfw.c optional runfw \ - compile-with "${AWK} -f $S/tools/fw_stub.awk runfw:runfw -mrunfw -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk run.fw:runfw -mrunfw -c${.TARGET}" \ no-implicit-rule before-depend local \ clean "runfw.c" runfw.fwo optional runfw \ - dependency "runfw" \ + dependency "run.fw" \ compile-with "${NORMAL_FWO}" \ no-implicit-rule \ clean "runfw.fwo" -runfw optional runfw \ +run.fw optional runfw \ dependency "$S/contrib/dev/run/rt2870.fw.uu" \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ - clean "runfw" + clean "run.fw" dev/usb/wlan/if_uath.c optional uath dev/usb/wlan/if_upgt.c optional upgt dev/usb/wlan/if_ural.c optional ural ==== //depot/projects/smpng/sys/conf/files.amd64#95 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: head/sys/conf/files.amd64 250840 2013-05-21 03:05:49Z marcel $ +# $FreeBSD: head/sys/conf/files.amd64 252206 2013-06-25 17:50:22Z davidcs $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -227,6 +227,12 @@ dev/nvram/nvram.c optional nvram isa dev/random/ivy.c optional random rdrand_rng dev/random/nehemiah.c optional random padlock_rng +dev/qlxge/qls_dbg.c optional qlxge pci +dev/qlxge/qls_dump.c optional qlxge pci +dev/qlxge/qls_hw.c optional qlxge pci +dev/qlxge/qls_ioctl.c optional qlxge pci +dev/qlxge/qls_isr.c optional qlxge pci +dev/qlxge/qls_os.c optional qlxge pci dev/qlxgb/qla_dbg.c optional qlxgb pci dev/qlxgb/qla_hw.c optional qlxgb pci dev/qlxgb/qla_ioctl.c optional qlxgb pci ==== //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#21 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-intel.c 249213 2013-04-06 19:12:49Z marius $"); +__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-intel.c 252203 2013-06-25 09:15:49Z mav $"); #include <sys/param.h> #include <sys/module.h> @@ -72,6 +72,7 @@ int reg, u_int32_t result); static int ata_intel_sata_sidpr_write(device_t dev, int port, int reg, u_int32_t result); +static int ata_intel_sata_sidpr_test(device_t dev); static int ata_intel_31244_ch_attach(device_t dev); static int ata_intel_31244_ch_detach(device_t dev); static int ata_intel_31244_status(device_t dev); @@ -416,22 +417,20 @@ } if (ch->flags & ATA_SATA) { if ((ctlr->chip->cfg1 & INTEL_ICH5)) { - ch->flags |= ATA_PERIODIC_POLL; - ch->hw.status = ata_intel_sata_status; ch->hw.pm_read = ata_intel_sata_cscr_read; ch->hw.pm_write = ata_intel_sata_cscr_write; } else if (ctlr->r_res2) { - ch->flags |= ATA_PERIODIC_POLL; - ch->hw.status = ata_intel_sata_status; if ((ctlr->chip->cfg1 & INTEL_ICH7)) { ch->hw.pm_read = ata_intel_sata_ahci_read; ch->hw.pm_write = ata_intel_sata_ahci_write; - } else { + } else if (ata_intel_sata_sidpr_test(dev)) { ch->hw.pm_read = ata_intel_sata_sidpr_read; ch->hw.pm_write = ata_intel_sata_sidpr_write; }; } if (ch->hw.pm_write != NULL) { + ch->flags |= ATA_PERIODIC_POLL; + ch->hw.status = ata_intel_sata_status; ata_sata_scr_write(ch, 0, ATA_SERROR, 0xffffffff); if ((ch->flags & ATA_NO_SLAVE) == 0) { @@ -835,6 +834,32 @@ } static int +ata_intel_sata_sidpr_test(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + int port; + uint32_t val; + + port = (ch->flags & ATA_NO_SLAVE) ? 0 : 1; + for (; port >= 0; port--) { + ata_intel_sata_sidpr_read(dev, port, ATA_SCONTROL, &val); + if ((val & ATA_SC_IPM_MASK) == + (ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER)) + return (1); + val |= ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER; + ata_intel_sata_sidpr_write(dev, port, ATA_SCONTROL, val); + ata_intel_sata_sidpr_read(dev, port, ATA_SCONTROL, &val); + if ((val & ATA_SC_IPM_MASK) == + (ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER)) + return (1); + } + if (bootverbose) + device_printf(dev, + "SControl registers are not functional: %08x\n", val); + return (0); +} + +static int ata_intel_31244_ch_attach(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); ==== //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#44 (text+ko) ==== @@ -94,7 +94,7 @@ * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/dev/mpt/mpt_cam.c 249468 2013-04-14 09:55:48Z mav $"); +__FBSDID("$FreeBSD: head/sys/dev/mpt/mpt_cam.c 252180 2013-06-24 21:27:15Z marius $"); #include <dev/mpt/mpt.h> #include <dev/mpt/mpt_cam.h> @@ -1254,7 +1254,8 @@ } /* - * Callback routine from "bus_dmamap_load" or, in simple cases, called directly. + * Callback routine from bus_dmamap_load_ccb(9) or, in simple cases, called + * directly. * * Takes a list of physical segments and builds the SGL for SCSI IO command * and forwards the commard to the IOC after one last check that CAM has not @@ -1688,7 +1689,6 @@ hdrp = req->req_vbuf; mpt_off = req->req_vbuf; - if (error == 0 && ((uint32_t)nseg) >= mpt->max_seg_cnt) { error = EFBIG; } @@ -3595,21 +3595,21 @@ #ifdef CAM_NEW_TRAN_CODE cpi->protocol = PROTO_SCSI; if (mpt->is_fc) { - cpi->hba_misc = PIM_NOBUSRESET; + cpi->hba_misc = PIM_NOBUSRESET | PIM_UNMAPPED; cpi->base_transfer_speed = 100000; cpi->hba_inquiry = PI_TAG_ABLE; cpi->transport = XPORT_FC; cpi->transport_version = 0; cpi->protocol_version = SCSI_REV_SPC; } else if (mpt->is_sas) { - cpi->hba_misc = PIM_NOBUSRESET; + cpi->hba_misc = PIM_NOBUSRESET | PIM_UNMAPPED; cpi->base_transfer_speed = 300000; cpi->hba_inquiry = PI_TAG_ABLE; cpi->transport = XPORT_SAS; cpi->transport_version = 0; cpi->protocol_version = SCSI_REV_SPC2; } else { - cpi->hba_misc = PIM_SEQSCAN; + cpi->hba_misc = PIM_SEQSCAN | PIM_UNMAPPED; cpi->base_transfer_speed = 3300; cpi->hba_inquiry = PI_SDTR_ABLE|PI_TAG_ABLE|PI_WIDE_16; cpi->transport = XPORT_SPI; ==== //depot/projects/smpng/sys/dev/pci/pci.c#133 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/dev/pci/pci.c 250418 2013-05-09 19:24:50Z jhb $"); +__FBSDID("$FreeBSD: head/sys/dev/pci/pci.c 252166 2013-06-24 18:30:44Z jhb $"); #include "opt_bus.h" @@ -280,7 +280,7 @@ enable these bits correctly. We'd like to do this all the time, but there\n\ are some peripherals that this causes problems with."); -static int pci_do_realloc_bars = 1; +static int pci_do_realloc_bars = 0; TUNABLE_INT("hw.pci.realloc_bars", &pci_do_realloc_bars); SYSCTL_INT(_hw_pci, OID_AUTO, realloc_bars, CTLFLAG_RW, &pci_do_realloc_bars, 0, ==== //depot/projects/smpng/sys/dev/usb/net/if_axe.c#28 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/dev/usb/net/if_axe.c 251679 2013-06-13 05:46:19Z kevlo $"); +__FBSDID("$FreeBSD: head/sys/dev/usb/net/if_axe.c 252185 2013-06-25 00:26:30Z yongari $"); /* * ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver. @@ -163,6 +163,7 @@ AXE_DEV(GOODWAY, GWUSB2E, 0), AXE_DEV(IODATA, ETGUS2, AXE_FLAG_178), AXE_DEV(JVC, MP_PRX1, 0), + AXE_DEV(LENOVO, ETHERNET, AXE_FLAG_772B), AXE_DEV(LINKSYS2, USB200M, 0), AXE_DEV(LINKSYS4, USB1000, AXE_FLAG_178), AXE_DEV(LOGITEC, LAN_GTJU2A, AXE_FLAG_178), @@ -1351,15 +1352,14 @@ if (AXE_IS_178_FAMILY(sc)) { sc->sc_flags &= ~(AXE_FLAG_STD_FRAME | AXE_FLAG_CSUM_FRAME); - if ((sc->sc_flags & AXE_FLAG_772B) != 0) + if ((sc->sc_flags & AXE_FLAG_772B) != 0 && + (ifp->if_capenable & IFCAP_RXCSUM) != 0) { sc->sc_lenmask = AXE_CSUM_HDR_LEN_MASK; - else + sc->sc_flags |= AXE_FLAG_CSUM_FRAME; + } else { sc->sc_lenmask = AXE_HDR_LEN_MASK; - if ((sc->sc_flags & AXE_FLAG_772B) != 0 && - (ifp->if_capenable & IFCAP_RXCSUM) != 0) - sc->sc_flags |= AXE_FLAG_CSUM_FRAME; - else sc->sc_flags |= AXE_FLAG_STD_FRAME; + } } /* Configure TX/RX checksum offloading. */ ==== //depot/projects/smpng/sys/dev/usb/serial/uark.c#16 (text+ko) ==== @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $FreeBSD: head/sys/dev/usb/serial/uark.c 239299 2012-08-15 15:42:57Z hselasky $ + * $FreeBSD: head/sys/dev/usb/serial/uark.c 252125 2013-06-23 20:22:49Z thomas $ */ /* ==== //depot/projects/smpng/sys/dev/usb/serial/umcs.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: head/sys/dev/usb/serial/umcs.h 222696 2011-06-04 20:40:24Z hselasky $ */ +/* $FreeBSD: head/sys/dev/usb/serial/umcs.h 252123 2013-06-23 20:19:51Z thomas $ */ /*- * Copyright (c) 2010 Lev Serebryakov <lev@FreeBSD.org>. * All rights reserved. @@ -596,7 +596,7 @@ #define MCS7840_UART_LSR_RHROVERRUN 0x02 /* Data FIFO/register overflow */ #define MCS7840_UART_LSR_PARITYERR 0x04 /* Parity error */ #define MCS7840_UART_LSR_FRAMEERR 0x10 /* Framing error */ -#define MCS7840_UART_LSR_BREAKERR 0x20 /* BREAK sigmal received */ +#define MCS7840_UART_LSR_BREAKERR 0x20 /* BREAK signal received */ #define MCS7840_UART_LSR_THREMPTY 0x40 /* THR register is empty, * ready for transmit */ #define MCS7840_UART_LSR_HASERR 0x80 /* Has error in receiver FIFO */ ==== //depot/projects/smpng/sys/dev/usb/usbdevs#180 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: head/sys/dev/usb/usbdevs 251538 2013-06-08 16:02:31Z rpaulo $ +$FreeBSD: head/sys/dev/usb/usbdevs 252196 2013-06-25 06:43:04Z kevlo $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -681,6 +681,7 @@ vendor SWEEX2 0x177f Sweex vendor METAGEEK 0x1781 MetaGeek vendor KAMSTRUP 0x17a8 Kamstrup A/S +vendor LENOVO 0x17ef Lenovo vendor WAVESENSE 0x17f4 WaveSense vendor VAISALA 0x1843 Vaisala vendor AMIT 0x18c5 AMIT @@ -1544,6 +1545,7 @@ product DLINK RTL8192CU_1 0x3307 RTL8192CU product DLINK RTL8192CU_2 0x3309 RTL8192CU product DLINK RTL8192CU_3 0x330a RTL8192CU +product DLINK DWA131B 0x330d DWA-131 rev B product DLINK2 DWA120 0x3a0c DWA-120 product DLINK2 DWA120_NF 0x3a0d DWA-120 (no firmware) product DLINK2 DWLG122C1 0x3c03 DWL-G122 c1 @@ -2462,6 +2464,9 @@ /* Leadtek products */ product LEADTEK 9531 0x2101 9531 GPS +/* Lenovo products */ +product LENOVO ETHERNET 0x7203 USB 2.0 Ethernet + /* Lexar products */ product LEXAR JUMPSHOT 0x0001 jumpSHOT CompactFlash Reader product LEXAR CF_READER 0xb002 USB CF Reader ==== //depot/projects/smpng/sys/dev/usb/wlan/if_urtwn.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_urtwn.c 251596 2013-06-10 05:45:16Z rpaulo $"); +__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_urtwn.c 252196 2013-06-25 06:43:04Z kevlo $"); /* * Driver for Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188RU/RTL8192CU. @@ -106,6 +106,7 @@ URTWN_DEV(DLINK, RTL8192CU_1), URTWN_DEV(DLINK, RTL8192CU_2), URTWN_DEV(DLINK, RTL8192CU_3), + URTWN_DEV(DLINK, DWA131B), URTWN_DEV(EDIMAX, EW7811UN), URTWN_DEV(EDIMAX, RTL8192CU), URTWN_DEV(FEIXUN, RTL8188CU), ==== //depot/projects/smpng/sys/fs/ext2fs/ext2_alloc.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $FreeBSD: head/sys/fs/ext2fs/ext2_alloc.c 251809 2013-06-16 16:10:45Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2_alloc.c 252103 2013-06-23 02:44:42Z pfg $ */ #include <sys/param.h> @@ -165,7 +165,8 @@ struct ext2mount *ump; struct cluster_save *buflist; struct indir start_ap[NIADDR + 1], end_ap[NIADDR + 1], *idp; - int32_t start_lbn, end_lbn, soff, newblk, blkno; + e2fs_lbn_t start_lbn, end_lbn; + int32_t soff, newblk, blkno; int i, len, start_lvl, end_lvl, pref, ssize; if (doreallocblks == 0) @@ -550,7 +551,7 @@ * that will hold the pointer */ int32_t -ext2_blkpref(struct inode *ip, int32_t lbn, int indx, int32_t *bap, +ext2_blkpref(struct inode *ip, e2fs_lbn_t lbn, int indx, int32_t *bap, int32_t blocknr) { int tmp; ==== //depot/projects/smpng/sys/fs/ext2fs/ext2_balloc.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93 - * $FreeBSD: head/sys/fs/ext2fs/ext2_balloc.c 251809 2013-06-16 16:10:45Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2_balloc.c 252103 2013-06-23 02:44:42Z pfg $ */ #include <sys/param.h> @@ -57,7 +57,7 @@ * the inode and the logical block number in a file. */ int -ext2_balloc(struct inode *ip, int32_t lbn, int size, struct ucred *cred, +ext2_balloc(struct inode *ip, e2fs_lbn_t lbn, int size, struct ucred *cred, struct buf **bpp, int flags) { struct m_ext2fs *fs; ==== //depot/projects/smpng/sys/fs/ext2fs/ext2_bmap.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 - * $FreeBSD: head/sys/fs/ext2fs/ext2_bmap.c 251823 2013-06-17 00:39:23Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2_bmap.c 252103 2013-06-23 02:44:42Z pfg $ */ #include <sys/param.h> @@ -99,8 +99,8 @@ struct mount *mp; struct vnode *devvp; struct indir a[NIADDR+1], *ap; - int32_t daddr; - long metalbn; + daddr_t daddr; + e2fs_lbn_t metalbn; int error, num, maxrun = 0, bsize; int *nump; @@ -241,7 +241,8 @@ int ext2_getlbns(struct vnode *vp, int32_t bn, struct indir *ap, int *nump) { - long blockcnt, metalbn, realbn; + long blockcnt; + e2fs_lbn_t metalbn, realbn; struct ext2mount *ump; int i, numlevels, off; int64_t qblockcnt; ==== //depot/projects/smpng/sys/fs/ext2fs/ext2_extern.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.3 (Berkeley) 4/16/94 - * $FreeBSD: head/sys/fs/ext2fs/ext2_extern.h 228539 2011-12-15 20:31:18Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2_extern.h 252103 2013-06-23 02:44:42Z pfg $ */ #ifndef _FS_EXT2FS_EXT2_EXTERN_H_ @@ -49,10 +49,10 @@ int ext2_alloc(struct inode *, int32_t, int32_t, int, struct ucred *, int32_t *); int ext2_balloc(struct inode *, - int32_t, int, struct ucred *, struct buf **, int); + e2fs_lbn_t, int, struct ucred *, struct buf **, int); int ext2_blkatoff(struct vnode *, off_t, char **, struct buf **); void ext2_blkfree(struct inode *, int32_t, long); -int32_t ext2_blkpref(struct inode *, int32_t, int, int32_t *, int32_t); +int32_t ext2_blkpref(struct inode *, e2fs_lbn_t, int, int32_t *, int32_t); int ext2_bmap(struct vop_bmap_args *); int ext2_bmaparray(struct vnode *, int32_t, int32_t *, int *, int *); void ext2_clusteracct(struct m_ext2fs *, char *, int, daddr_t, int); ==== //depot/projects/smpng/sys/fs/ext2fs/ext2_subr.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93 - * $FreeBSD: head/sys/fs/ext2fs/ext2_subr.c 246634 2013-02-10 19:49:37Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2_subr.c 252103 2013-06-23 02:44:42Z pfg $ */ #include <sys/param.h> @@ -68,7 +68,7 @@ struct inode *ip; struct m_ext2fs *fs; struct buf *bp; - int32_t lbn; + e2fs_lbn_t lbn; int bsize, error; ip = VTOI(vp); ==== //depot/projects/smpng/sys/fs/ext2fs/ext2fs.h#9 (text+ko) ==== @@ -4,7 +4,7 @@ * Aug 1995, Godmar Back (gback@cs.utah.edu) * University of Utah, Department of Computer Science * - * $FreeBSD: head/sys/fs/ext2fs/ext2fs.h 251952 2013-06-18 15:49:30Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/ext2fs.h 252012 2013-06-20 00:00:33Z pfg $ */ /*- * Copyright (c) 2009 Aditya Sarawgi @@ -237,12 +237,12 @@ uint16_t ext2bgd_nbfree; /* number of free blocks */ uint16_t ext2bgd_nifree; /* number of free inodes */ uint16_t ext2bgd_ndirs; /* number of directories */ - uint16_t ext2bgd_flags; /* block group flags */ - uint32_t ext2bgd_x_bitmap; /* snapshot exclusion bitmap loc. */ - uint16_t ext2bgd_b_bmap_csum; /* block bitmap checksum */ - uint16_t ext2bgd_i_bmap_csum; /* inode bitmap checksum */ - uint16_t ext2bgd_i_unused; /* unused inode count */ - uint16_t ext2bgd_csum; /* group descriptor checksum */ + uint16_t ext4bgd_flags; /* block group flags */ + uint32_t ext4bgd_x_bitmap; /* snapshot exclusion bitmap loc. */ + uint16_t ext4bgd_b_bmap_csum; /* block bitmap checksum */ + uint16_t ext4bgd_i_bmap_csum; /* inode bitmap checksum */ + uint16_t ext4bgd_i_unused; /* unused inode count */ + uint16_t ext4bgd_csum; /* group descriptor checksum */ }; ==== //depot/projects/smpng/sys/fs/ext2fs/fs.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)fs.h 8.7 (Berkeley) 4/19/94 - * $FreeBSD: head/sys/fs/ext2fs/fs.h 251809 2013-06-16 16:10:45Z pfg $ + * $FreeBSD: head/sys/fs/ext2fs/fs.h 252103 2013-06-23 02:44:42Z pfg $ */ #ifndef _FS_EXT2FS_FS_H_ @@ -98,8 +98,8 @@ * Turn file system block numbers into disk block addresses. * This maps file system blocks to device size blocks. */ -#define fsbtodb(fs, b) ((b) << ((fs)->e2fs_fsbtodb)) -#define dbtofsb(fs, b) ((b) >> ((fs)->e2fs_fsbtodb)) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306252029.r5PKTWpD087567>