[SCSI] fix proc_scsi_write to return "length" on success with remove-single-device case

James Bottomley · James Bottomley · commit 2ca48a132167 · 2006-05-10T10:22:30.000-05:00
Problem spotted by: Suzuki K P &lt;suzuki@in.ibm.com&gt;

A zero return on success isn't correct for filesystem write functions.
They should either return negative error or the length of bytes
consumed.  Add code to convert our zero on success error return to
return the length of bytes passed in.

This fixes the following:

$ echo "scsi remove-single-device 0 0 3 0" &gt; /proc/scsi/scsi
bash: echo: write error: No such device or address"

Signed-off-by: James Bottomley &lt;James.Bottomley@SteelEye.com&gt;
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
@@ -266,8 +266,6 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf,
 		lun = simple_strtoul(p + 1, &p, 0);
 
 		err = scsi_add_single_device(host, channel, id, lun);
-		if (err >= 0)
-			err = length;
 
 	/*
 	 * Usage: echo "scsi remove-single-device 0 1 2 3" >/proc/scsi/scsi
@@ -284,6 +282,13 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf,
 		err = scsi_remove_single_device(host, channel, id, lun);
 	}
 
+	/*
+	 * convert success returns so that we return the 
+	 * number of bytes consumed.
+	 */
+	if (!err)
+		err = length;
+
  out:
 	free_page((unsigned long)buffer);
 	return err;
