Skip to contentSkip to conversation

:Staging: hv: Remove osd layer

PATCH In review K. Y. Srinivasan 1 participant 1 message Feb 11, 2011

Subsystems (2)
Staging virtio core
lore
Share & tools
lore

K. Y. Srinivasan

author
#0 lore raw

PATCH 3/3 :Staging: hv: Remove osd layer

The OSD layer was a wrapper around native interfaces adding little value and was infact buggy - refer to the osd_wait.patch for details. This patch gets rid of the OSD abstraction.

Signed-off-by K. Y. Srinivasan <[email protected]>
Signed-off-by Hank Janssen <[email protected]>
---
 drivers/staging/hv/Makefile       |    2 +-
 drivers/staging/hv/blkvsc.c       |    2 +-
 drivers/staging/hv/blkvsc_drv.c   |    2 +-
 drivers/staging/hv/channel.c      |    5 +-
 drivers/staging/hv/channel_mgmt.c |    2 +-
 drivers/staging/hv/connection.c   |    2 +-
 drivers/staging/hv/hv.c           |    2 +-
 drivers/staging/hv/hv_api.h       |    5 +
 drivers/staging/hv/hv_kvp.c       |    2 +-
 drivers/staging/hv/hv_util.c      |    2 +-
 drivers/staging/hv/logging.h      |    3 +
 drivers/staging/hv/netvsc.c       |    2 +-
 drivers/staging/hv/netvsc_drv.c   |    2 +-
 drivers/staging/hv/osd.c          |  194 -------------------------------------
 drivers/staging/hv/osd.h          |   62 ------------
 drivers/staging/hv/ring_buffer.c  |    1 -
 drivers/staging/hv/rndis_filter.c |    2 +-
 drivers/staging/hv/storvsc.c      |    2 +-
 drivers/staging/hv/storvsc_drv.c  |    2 +-
 drivers/staging/hv/vmbus_drv.c    |    2 +-
 20 files changed, 26 insertions(+), 272 deletions(-)
 delete mode 100644 drivers/staging/hv/osd.c
 delete mode 100644 drivers/staging/hv/osd.h
drivers/staging/hv/Makefile +1 -1
index 606ce7d..737e517 100644
@@ -4,7 +4,7 @@ obj-$(CONFIG_HYPERV_BLOCK)	+= hv_blkvsc.o
 obj-$(CONFIG_HYPERV_NET)	+= hv_netvsc.o
 obj-$(CONFIG_HYPERV_UTILS)	+= hv_utils.o
 
-hv_vmbus-y := vmbus_drv.o osd.o \
+hv_vmbus-y := vmbus_drv.o \
 		 hv.o connection.o channel.o \
 		 channel_mgmt.o ring_buffer.o
 hv_storvsc-y := storvsc_drv.o storvsc.o
drivers/staging/hv/blkvsc.c +1 -1
index b0e07c1..7c8729b 100644
@@ -22,7 +22,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include "osd.h"
+#include "hv_api.h"
 #include "storvsc.c"
 
 static const char *g_blk_driver_name = "blkvsc";
drivers/staging/hv/blkvsc_drv.c +1 -1
index 58bbcd6..36a0adb 100644
@@ -31,7 +31,7 @@
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_dbg.h>
-#include "osd.h"
+#include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
 #include "vmbus.h"
drivers/staging/hv/channel.c +4 -1
index 5a0923c..775a52a 100644
@@ -24,10 +24,13 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include "osd.h"
+#include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
 
+#define NUM_PAGES_SPANNED(addr, len) \
+((PAGE_ALIGN(addr + len) >> PAGE_SHIFT) - (addr >> PAGE_SHIFT))
+
 /* Internal routines */
 static int create_gpadl_header(
 	void *kbuffer,	/* must be phys and virt contiguous */
drivers/staging/hv/channel_mgmt.c +1 -1
index da1e56a..325e0bc 100644
@@ -26,7 +26,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/completion.h>
-#include "osd.h"
+#include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
 #include "utils.h"
drivers/staging/hv/connection.c +1 -1
index 51dd362..f7df479 100644
@@ -26,7 +26,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include "osd.h"
+#include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
drivers/staging/hv/hv.c +1 -1
index 419b4d6..31b9073 100644
@@ -23,7 +23,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include "osd.h"
+#include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
drivers/staging/hv/hv_api.h +5 -0
index 70e863a..7114fce 100644
@@ -23,6 +23,11 @@
 #ifndef __HV_API_H
 #define __HV_API_H
 
+struct hv_guid {
+	unsigned char data[16];
+};
+
+
 
 /* Status codes for hypervisor operations. */
drivers/staging/hv/hv_kvp.c +1 -1
index bc1c20e..faf692e 100644
@@ -28,7 +28,7 @@
 #include <linux/workqueue.h>
 
 #include "logging.h"
-#include "osd.h"
+#include "hv_api.h"
 #include "vmbus.h"
 #include "vmbus_packet_format.h"
 #include "vmbus_channel_interface.h"
drivers/staging/hv/hv_util.c +1 -1
index 43c7ec0..4792f2c 100644
@@ -28,7 +28,7 @@
 #include <linux/pci.h>
 
 #include "logging.h"
-#include "osd.h"
+#include "hv_api.h"
 #include "vmbus.h"
 #include "vmbus_packet_format.h"
 #include "vmbus_channel_interface.h"
drivers/staging/hv/logging.h +3 -0
index 20d4d12..1799951 100644
@@ -25,6 +25,9 @@
 #ifndef _LOGGING_H_
 #define _LOGGING_H_
 
+#define LOWORD(dw) ((unsigned short)(dw))
+#define HIWORD(dw) ((unsigned short)(((unsigned int) (dw) >> 16) & 0xFFFF))
+
 /* #include <linux/init.h> */
 /* #include <linux/module.h> */
drivers/staging/hv/netvsc.c +1 -1
index 7233564..fa46a7e 100644
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/slab.h>
-#include "osd.h"
+#include "hv_api.h"
 #include "logging.h"
 #include "netvsc.h"
 #include "rndis_filter.h"
drivers/staging/hv/netvsc_drv.c +1 -1
index 6b8fd0c..e190738 100644
@@ -36,7 +36,7 @@
 #include <net/route.h>
 #include <net/sock.h>
 #include <net/pkt_sched.h>
-#include "osd.h"
+#include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
 #include "vmbus.h"
drivers/staging/hv/osd.c deleted +0 -194

194 lines not on this page · raw message

drivers/staging/hv/osd.h deleted +0 -62

62 lines not on this page · raw message

drivers/staging/hv/ring_buffer.c +0 -1
index 4d53392..66688fb 100644
@@ -23,7 +23,6 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include "osd.h"
 #include "logging.h"
 #include "ring_buffer.h"
drivers/staging/hv/rndis_filter.c +1 -1
index e3bf004..9dde936 100644
@@ -26,8 +26,8 @@
 #include <linux/io.h>
 #include <linux/if_ether.h>
 
-#include "osd.h"
 #include "logging.h"
+#include "hv_api.h"
 #include "netvsc_api.h"
 #include "rndis_filter.h"
drivers/staging/hv/storvsc.c +1 -1
index 2560342..e2ad729 100644
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/delay.h>
-#include "osd.h"
+#include "hv_api.h"
 #include "logging.h"
 #include "storvsc_api.h"
 #include "vmbus_packet_format.h"
drivers/staging/hv/storvsc_drv.c +1 -1
index 956c9eb..a8427ff 100644
@@ -31,7 +31,7 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_devinfo.h>
 #include <scsi/scsi_dbg.h>
-#include "osd.h"
+#include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
 #include "vmbus.h"
drivers/staging/hv/vmbus_drv.c +1 -1
index dacaa54..459c707 100644
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include "version_info.h"
-#include "osd.h"
+#include "hv_api.h"
 #include "logging.h"
 #include "vmbus.h"
 #include "channel.h"
Signature · 1 line
1.5.5.6