[PATCH] scsi: device_reprobe() can fail

From: Jeff Garzik
Date: Sat Sep 30 2006 - 21:24:47 EST



[This has been sitting in James Bottomley's scsi-misc for five days.
With SCSI outputting a warning for almost -every- file, let's go ahead
and get the patch in.]

From: Andrew Morton <akpm@xxxxxxxx>

device_reprobe() should return an error code. When it does so,
scsi_device_reprobe() should propagate it back.

Acked-by: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxxxxxxx>

---

include/scsi/scsi_device.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

8350a348e97c2f8aa3e91c025c0e040c90146414
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 895d212..b401c82 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -298,9 +298,9 @@ extern int scsi_execute_async(struct scs
void (*done)(void *, char *, int, int),
gfp_t gfp);

-static inline void scsi_device_reprobe(struct scsi_device *sdev)
+static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev)
{
- device_reprobe(&sdev->sdev_gendev);
+ return device_reprobe(&sdev->sdev_gendev);
}

static inline unsigned int sdev_channel(struct scsi_device *sdev)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/