From a21f83e03067c284d93e5a716cbb517e2a376139 Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Wed, 25 Jun 2008 11:22:41 -0400
Subject: [PATCH] --- yaml --- r: 101561 b: refs/heads/master c:
 5b635da11e3a6387172abd651d26d8ef54b1fbc7 h: refs/heads/master i:   101559:
 4f3e355913ce2e2a88d855633bfebeed621fd36c v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/scsi/sd.c | 5 -----
 trunk/drivers/scsi/sd.h | 5 +++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6e18d0d1d512..91f5a6fc315c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa91696e56a0870db5754610e9f9b937e77507e0
+refs/heads/master: 5b635da11e3a6387172abd651d26d8ef54b1fbc7
diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c
index e19691f880b9..71069d952dc7 100644
--- a/trunk/drivers/scsi/sd.c
+++ b/trunk/drivers/scsi/sd.c
@@ -295,11 +295,6 @@ static int sd_major(int major_idx)
 	}
 }
 
-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)
 {
 	struct scsi_disk *sdkp = NULL;
diff --git a/trunk/drivers/scsi/sd.h b/trunk/drivers/scsi/sd.h
index 4f032d48cb6e..03a3d45cfa42 100644
--- a/trunk/drivers/scsi/sd.h
+++ b/trunk/drivers/scsi/sd.h
@@ -48,6 +48,11 @@ struct scsi_disk {
 };
 #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev)
 
+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,		\