From a5a0b6b37feef4cd60fbc8b524065202fd68ba49 Mon Sep 17 00:00:00 2001
From: Boaz Harrosh <bharrosh@panasas.com>
Date: Mon, 16 Nov 2009 20:39:25 +0200
Subject: [PATCH] --- yaml --- r: 173714 b: refs/heads/master c:
 d531b37929f412de09e9ad711fdd5b04fa39aca1 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/include/scsi/osd_initiator.h | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e3fb9a886dff..554ff4435fb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d48fcca1ff5d106b0ac6770a31b13e3630b244a
+refs/heads/master: d531b37929f412de09e9ad711fdd5b04fa39aca1
diff --git a/trunk/include/scsi/osd_initiator.h b/trunk/include/scsi/osd_initiator.h
index 02bd9f716357..f787d24d3bab 100644
--- a/trunk/include/scsi/osd_initiator.h
+++ b/trunk/include/scsi/osd_initiator.h
@@ -84,6 +84,15 @@ static inline void osd_dev_set_ver(struct osd_dev *od, enum osd_std_version v)
 #endif
 }
 
+static inline bool osd_dev_is_ver1(struct osd_dev *od)
+{
+#ifdef OSD_VER1_SUPPORT
+	return od->version == OSD_VER1;
+#else
+	return false;
+#endif
+}
+
 struct osd_request;
 typedef void (osd_req_done_fn)(struct osd_request *or, void *private);
 
@@ -120,14 +129,9 @@ struct osd_request {
 	int async_error;
 };
 
-/* OSD Version control */
 static inline bool osd_req_is_ver1(struct osd_request *or)
 {
-#ifdef OSD_VER1_SUPPORT
-	return or->osd_dev->version == OSD_VER1;
-#else
-	return false;
-#endif
+	return osd_dev_is_ver1(or->osd_dev);
 }
 
 /*