diff options
Diffstat (limited to 'usr/src/uts/common')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_dir.c | 1 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_znode.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/io/scsi/adapters/smrt/smrt_ciss.c | 16 | ||||
| -rw-r--r-- | usr/src/uts/common/io/scsi/adapters/smrt/smrt_device.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/io/scsi/adapters/smrt/smrt_physical.c | 1 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/scsi/adapters/smrt/smrt_scsi.h | 8 |
6 files changed, 16 insertions, 14 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_dir.c b/usr/src/uts/common/fs/zfs/zfs_dir.c index 3841c11d11..5d377a109e 100644 --- a/usr/src/uts/common/fs/zfs/zfs_dir.c +++ b/usr/src/uts/common/fs/zfs/zfs_dir.c @@ -717,6 +717,7 @@ zfs_rmnode(znode_t *zp) dmu_tx_hold_free(tx, acl_obj, 0, DMU_OBJECT_END); zfs_sa_upgrade_txholds(tx, zp); + dmu_tx_mark_netfree(tx); error = dmu_tx_assign(tx, TXG_WAIT); if (error) { /* diff --git a/usr/src/uts/common/fs/zfs/zfs_znode.c b/usr/src/uts/common/fs/zfs/zfs_znode.c index 257d5b2a35..84ba5947fa 100644 --- a/usr/src/uts/common/fs/zfs/zfs_znode.c +++ b/usr/src/uts/common/fs/zfs/zfs_znode.c @@ -1246,6 +1246,8 @@ zfs_zget(zfsvfs_t *zfsvfs, uint64_t obj_num, znode_t **zpp) if (zp == NULL) { err = SET_ERROR(ENOENT); } else { + if (zp->z_links == 0) + zp->z_unlinked = B_TRUE; *zpp = zp; } ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num); diff --git a/usr/src/uts/common/io/scsi/adapters/smrt/smrt_ciss.c b/usr/src/uts/common/io/scsi/adapters/smrt/smrt_ciss.c index b4cdd5607e..8da9ac9038 100644 --- a/usr/src/uts/common/io/scsi/adapters/smrt/smrt_ciss.c +++ b/usr/src/uts/common/io/scsi/adapters/smrt/smrt_ciss.c @@ -123,15 +123,15 @@ * The CISS specification allows for three different kinds of attributes that * describe how requests are queued to the controller. These are: * - * HEAD OF QUEUE The request should go to the head of the - * controller queue. This is used for resets and - * aborts to ensure that they're not blocked behind - * additional I/O. + * HEAD OF QUEUE The request should go to the head of the + * controller queue. This is used for resets and + * aborts to ensure that they're not blocked behind + * additional I/O. * - * SIMPLE This queues the request for normal processing. - * Commands queued this way are not special with - * respect to one another. We use this for all I/O - * and discovery commands. + * SIMPLE This queues the request for normal processing. + * Commands queued this way are not special with + * respect to one another. We use this for all I/O + * and discovery commands. * * ORDERED This attribute is used to indicate that commands * should be submitted and processed in some order. diff --git a/usr/src/uts/common/io/scsi/adapters/smrt/smrt_device.c b/usr/src/uts/common/io/scsi/adapters/smrt/smrt_device.c index 9e27448b68..433b2ea2ee 100644 --- a/usr/src/uts/common/io/scsi/adapters/smrt/smrt_device.c +++ b/usr/src/uts/common/io/scsi/adapters/smrt/smrt_device.c @@ -58,7 +58,7 @@ smrt_locate_cfgtbl(smrt_t *smrt, pci_regspec_t *regs, unsigned nregs, /* * Locate the Configuration Table. Three different values read * from two I2O registers allow us to determine the location: - * - the correct PCI BAR offset is in the low 16 bits of + * - the correct PCI BAR offset is in the low 16 bits of * CISS_I2O_CFGTBL_CFG_OFFSET * - bit 16 is 0 for a 32-bit space, and 1 for 64-bit * - the memory offset from the base of this BAR is diff --git a/usr/src/uts/common/io/scsi/adapters/smrt/smrt_physical.c b/usr/src/uts/common/io/scsi/adapters/smrt/smrt_physical.c index 8ab3927673..88ed57bc7d 100644 --- a/usr/src/uts/common/io/scsi/adapters/smrt/smrt_physical.c +++ b/usr/src/uts/common/io/scsi/adapters/smrt/smrt_physical.c @@ -606,7 +606,6 @@ smrt_phys_teardown(smrt_t *smrt) { smrt_physical_t *smpt; - VERIFY(MUTEX_HELD(&smrt->smrt_mutex)); while ((smpt = list_remove_head(&smrt->smrt_physicals)) != NULL) { smrt_physical_free(smpt); } diff --git a/usr/src/uts/common/sys/scsi/adapters/smrt/smrt_scsi.h b/usr/src/uts/common/sys/scsi/adapters/smrt/smrt_scsi.h index 47ef99b2e0..45c4c84407 100644 --- a/usr/src/uts/common/sys/scsi/adapters/smrt/smrt_scsi.h +++ b/usr/src/uts/common/sys/scsi/adapters/smrt/smrt_scsi.h @@ -26,10 +26,10 @@ extern "C" { #endif /* CISS LUN Addressing MODEs */ -#define PERIPHERIAL_DEV_ADDR 0x0 -#define LOGICAL_VOL_ADDR 0x1 -#define MASK_PERIPHERIAL_DEV_ADDR 0x3 -#define CISS_PHYS_MODE 0x0 +#define PERIPHERIAL_DEV_ADDR 0x0 +#define LOGICAL_VOL_ADDR 0x1 +#define MASK_PERIPHERIAL_DEV_ADDR 0x3 +#define CISS_PHYS_MODE 0x0 /* * Vendor-specific SCSI Commands |