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

Commit d40e5671 authored by Philipp Reisner's avatar Philipp Reisner Committed by Jens Axboe
Browse files

drbd: Remove drbd_wrappers.h 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent d7fe69c6

drivers/block/drbd/drbd_actlog.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/drbd_limits.h>

#include <linux/dynamic_debug.h>

#include "drbd_int.h"

#include "drbd_wrappers.h"





enum al_transaction_types {

drivers/block/drbd/drbd_int.h

+35 −0
Original line number Diff line number Diff line
@@ -1283,6 +1283,10 @@ extern void conn_try_outdate_peer_async(struct drbd_connection *connection); 
extern int drbd_khelper(struct drbd_device *device, char *cmd);



/* drbd_worker.c */

/* bi_end_io handlers */

extern void drbd_md_io_complete(struct bio *bio, int error);

extern void drbd_peer_request_endio(struct bio *bio, int error);

extern void drbd_request_endio(struct bio *bio, int error);

extern int drbd_worker(struct drbd_thread *thi);

enum drbd_ret_code drbd_resync_after_valid(struct drbd_device *device, int o_minor);

void drbd_resync_after_changed(struct drbd_device *device);
@@ -1401,6 +1405,37 @@ static inline void drbd_tcp_quickack(struct socket *sock) 
			(char*)&val, sizeof(val));

}



/* sets the number of 512 byte sectors of our virtual device */

static inline void drbd_set_my_capacity(struct drbd_device *device,

					sector_t size)

{

	/* set_capacity(device->this_bdev->bd_disk, size); */

	set_capacity(device->vdisk, size);

	device->this_bdev->bd_inode->i_size = (loff_t)size << 9;

}



/*

 * used to submit our private bio

 */

static inline void drbd_generic_make_request(struct drbd_device *device,

					     int fault_type, struct bio *bio)

{

	__release(local);

	if (!bio->bi_bdev) {

		printk(KERN_ERR "drbd%d: drbd_generic_make_request: "

				"bio->bi_bdev == NULL\n",

		       device_to_minor(device));

		dump_stack();

		bio_endio(bio, -ENODEV);

		return;

	}



	if (drbd_insert_fault(device, fault_type))

		bio_endio(bio, -EIO);

	else

		generic_make_request(bio);

}



void drbd_bump_write_ordering(struct drbd_connection *connection, enum write_ordering_e wo);



/* drbd_proc.c */

drivers/block/drbd/drbd_nl.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "drbd_int.h"

#include "drbd_protocol.h"

#include "drbd_req.h"

#include "drbd_wrappers.h"

#include <asm/unaligned.h>

#include <linux/drbd_limits.h>

#include <linux/kthread.h>

drivers/block/drbd/drbd_nla.c

+0 −1
Original line number Diff line number Diff line 
#include "drbd_wrappers.h"

#include <linux/kernel.h>

#include <net/netlink.h>

#include <linux/drbd_genl_api.h>

drivers/block/drbd/drbd_req.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <linux/slab.h>

#include <linux/drbd.h>

#include "drbd_int.h"

#include "drbd_wrappers.h"



/* The request callbacks will be called in irq context by the IDE drivers,

   and in Softirqs/Tasklets/BH context by the SCSI drivers,