aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2008-06-25 11:22:41 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-07-12 09:22:31 -0400
commit5b635da11e3a6387172abd651d26d8ef54b1fbc7 (patch)
tree0b7018d5008902e96aa4f69db3807a00c0307027
parentaa91696e56a0870db5754610e9f9b937e77507e0 (diff)
[SCSI] sd: Move scsi_disk() accessor function to sd.h
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/sd.c5
-rw-r--r--drivers/scsi/sd.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e19691f880b9..71069d952dc7 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -295,11 +295,6 @@ static int sd_major(int major_idx)
295 } 295 }
296} 296}
297 297
298static inline struct scsi_disk *scsi_disk(struct gendisk *disk)
299{
300 return container_of(disk->private_data, struct scsi_disk, driver);
301}
302
303static struct scsi_disk *__scsi_disk_get(struct gendisk *disk) 298static struct scsi_disk *__scsi_disk_get(struct gendisk *disk)
304{ 299{
305 struct scsi_disk *sdkp = NULL; 300 struct scsi_disk *sdkp = NULL;
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 4f032d48cb6e..03a3d45cfa42 100644
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -48,6 +48,11 @@ struct scsi_disk {
48}; 48};
49#define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev) 49#define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev)
50 50
51static inline struct scsi_disk *scsi_disk(struct gendisk *disk)
52{
53 return container_of(disk->private_data, struct scsi_disk, driver);
54}
55
51#define sd_printk(prefix, sdsk, fmt, a...) \ 56#define sd_printk(prefix, sdsk, fmt, a...) \
52 (sdsk)->disk ? \ 57 (sdsk)->disk ? \
53 sdev_printk(prefix, (sdsk)->device, "[%s] " fmt, \ 58 sdev_printk(prefix, (sdsk)->device, "[%s] " fmt, \