Commit 0ce3a7e5 authored Jul 11, 2008 by Brian King Committed by James Bottomley Jul 11, 2008

[SCSI] ipr: Fix HDIO_GET_IDENTITY oops for SATA devices



Currently, ipr does not support HDIO_GET_IDENTITY to SATA devices.
An oops occurs if userspace attempts to send the command. Since hald
issues the command, ensure we fail the ioctl in ipr. This is a
temporary solution to the oops. Once the ipr libata EH conversion
is upstream, ipr will fully support HDIO_GET_IDENTITY.

Tested-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 081a5bcb

drivers/scsi/ipr.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@
		#include <linux/module.h>
		#include <linux/moduleparam.h>
		#include <linux/libata.h>
		#include <linux/hdreg.h>
		#include <asm/io.h>
		#include <asm/irq.h>
		#include <asm/processor.h>
		@@ -4913,8 +4914,11 @@ static int ipr_ioctl(struct scsi_device sdev, int cmd, void __user arg)
		struct ipr_resource_entry *res;

		res = (struct ipr_resource_entry *)sdev->hostdata;
		if (res && ipr_is_gata(res))
		if (res && ipr_is_gata(res)) {
		if (cmd == HDIO_GET_IDENTITY)
		return -ENOTTY;
		return ata_scsi_ioctl(sdev, cmd, arg);
		}

		return -EINVAL;
		}

Admin message