Commit 7557c1b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Four small fixes.

  Three are in drivers for fairly obvious bugs. The fourth is a set of
  regressions introduced by the compat_ioctl changes because some of the
  compat updates wrongly replaced .ioctl instead of .compat_ioctl"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: compat_ioctl: cdrom: Replace .ioctl with .compat_ioctl in four appropriate places
  scsi: zfcp: fix wrong data and display format of SFP+ temperature
  scsi: sd_sbc: Fix sd_zbc_report_zones()
  scsi: libfc: free response frame from GPN_ID
parents 29795de0 03264ddd

drivers/block/paride/pcd.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static const struct block_device_operations pcd_bdops = { 
	.release	= pcd_block_release,

	.ioctl		= pcd_block_ioctl,

#ifdef CONFIG_COMPAT

	.ioctl		= blkdev_compat_ptr_ioctl,

	.compat_ioctl	= blkdev_compat_ptr_ioctl,

#endif

	.check_events	= pcd_block_check_events,

};

drivers/cdrom/gdrom.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ static const struct block_device_operations gdrom_bdops = { 
	.check_events		= gdrom_bdops_check_events,

	.ioctl			= gdrom_bdops_ioctl,

#ifdef CONFIG_COMPAT

	.ioctl			= blkdev_compat_ptr_ioctl,

	.compat_ioctl		= blkdev_compat_ptr_ioctl,

#endif

};

drivers/ide/ide-gd.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static const struct block_device_operations ide_gd_ops = { 
	.release		= ide_gd_release,

	.ioctl			= ide_gd_ioctl,

#ifdef CONFIG_COMPAT

	.ioctl			= ide_gd_compat_ioctl,

	.compat_ioctl		= ide_gd_compat_ioctl,

#endif

	.getgeo			= ide_gd_getgeo,

	.check_events		= ide_gd_check_events,

drivers/s390/scsi/zfcp_fsf.h

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ struct fsf_qtcb_bottom_port { 
	u8 cb_util;

	u8 a_util;

	u8 res2;

	u16 temperature;

	s16 temperature;

	u16 vcc;

	u16 tx_bias;

	u16 tx_power;

drivers/s390/scsi/zfcp_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ static ZFCP_DEV_ATTR(adapter_diag, b2b_credit, 0400, 
	static ZFCP_DEV_ATTR(adapter_diag_sfp, _name, 0400,		       \

			     zfcp_sysfs_adapter_diag_sfp_##_name##_show, NULL)



ZFCP_DEFINE_DIAG_SFP_ATTR(temperature, temperature, 5, "%hu");

ZFCP_DEFINE_DIAG_SFP_ATTR(temperature, temperature, 6, "%hd");

ZFCP_DEFINE_DIAG_SFP_ATTR(vcc, vcc, 5, "%hu");

ZFCP_DEFINE_DIAG_SFP_ATTR(tx_bias, tx_bias, 5, "%hu");

ZFCP_DEFINE_DIAG_SFP_ATTR(tx_power, tx_power, 5, "%hu");

CRA Git | Maintained and supported by SUSTech CRA and CCSE