Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3fe0bb6 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

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: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0c3b7b2f

drivers/staging/hv/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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"