Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32993523 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[SCSI] fix SCSI_IOCTL_PROBE_HOST 



This returns always false with new-style drivers right now.  Make it
return always true instead, as a host must be present if we are able
to call the ioctl (without a host attached there would be no device
node to call on..)

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 48690405

drivers/scsi/scsi_ioctl.c

+9 −9
Original line number Diff line number Diff line
@@ -30,20 +30,20 @@ 


#define MAX_BUF PAGE_SIZE



/*

 * If we are told to probe a host, we will return 0 if  the host is not

 * present, 1 if the host is present, and will return an identifying

 * string at *arg, if arg is non null, filling to the length stored at

 * (int *) arg

/**

 * ioctl_probe  --  return host identification

 * @host:	host to identify

 * @buffer:	userspace buffer for identification

 *

 * Return an identifying string at @buffer, if @buffer is non-NULL, filling

 * to the length stored at * (int *) @buffer.

 */



static int ioctl_probe(struct Scsi_Host *host, void __user *buffer)

{

	unsigned int len, slen;

	const char *string;

	int temp = host->hostt->present;



	if (temp && buffer) {

	if (buffer) {

		if (get_user(len, (unsigned int __user *) buffer))

			return -EFAULT;
@@ -59,7 +59,7 @@ static int ioctl_probe(struct Scsi_Host *host, void __user *buffer) 
				return -EFAULT;

		}

	}

	return temp;

	return 1;

}



/*