2 files changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/sd.c | 5 -----
include/scsi/sd.h | 5 +++++
Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
---
diff -r d13d7571165e -r b512cd02f8b0 drivers/scsi/sd.c
--- a/drivers/scsi/sd.c Fri Apr 25 17:39:29 2008 -0400
+++ b/drivers/scsi/sd.c Fri Apr 25 17:39:29 2008 -0400
@@ -292,11 +292,6 @@
BUG();
return 0; /* shut up gcc */
}
-}
-
-static inline struct scsi_disk *scsi_disk(struct gendisk *disk)
-{
- return container_of(disk->private_data, struct scsi_disk, driver);
}
static struct scsi_disk *__scsi_disk_get(struct gendisk *disk)
diff -r d13d7571165e -r b512cd02f8b0 include/scsi/sd.h
--- a/include/scsi/sd.h Fri Apr 25 17:39:29 2008 -0400
+++ b/include/scsi/sd.h Fri Apr 25 17:39:29 2008 -0400
@@ -50,6 +50,11 @@
extern void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
+static inline struct scsi_disk *scsi_disk(struct gendisk *disk)
+{
+ return container_of(disk->private_data, struct scsi_disk, driver);
+}
+
#define sd_printk(prefix, sdsk, fmt, a...) \
(sdsk)->disk ? \
sdev_printk(prefix, (sdsk)->device, "[%s] " fmt, \
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
