drbd: Remove drbd_wrappers.h
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com> Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Philipp Reisner
Jens Axboe
parent
d7fe69c6a1
commit
d40e567149
6 changed files with 35 additions and 58 deletions
|
|
@ -29,7 +29,6 @@
|
||||||
#include <linux/drbd_limits.h>
|
#include <linux/drbd_limits.h>
|
||||||
#include <linux/dynamic_debug.h>
|
#include <linux/dynamic_debug.h>
|
||||||
#include "drbd_int.h"
|
#include "drbd_int.h"
|
||||||
#include "drbd_wrappers.h"
|
|
||||||
|
|
||||||
|
|
||||||
enum al_transaction_types {
|
enum al_transaction_types {
|
||||||
|
|
|
||||||
|
|
@ -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);
|
extern int drbd_khelper(struct drbd_device *device, char *cmd);
|
||||||
|
|
||||||
/* drbd_worker.c */
|
/* 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);
|
extern int drbd_worker(struct drbd_thread *thi);
|
||||||
enum drbd_ret_code drbd_resync_after_valid(struct drbd_device *device, int o_minor);
|
enum drbd_ret_code drbd_resync_after_valid(struct drbd_device *device, int o_minor);
|
||||||
void drbd_resync_after_changed(struct drbd_device *device);
|
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));
|
(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);
|
void drbd_bump_write_ordering(struct drbd_connection *connection, enum write_ordering_e wo);
|
||||||
|
|
||||||
/* drbd_proc.c */
|
/* drbd_proc.c */
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,6 @@
|
||||||
#include "drbd_int.h"
|
#include "drbd_int.h"
|
||||||
#include "drbd_protocol.h"
|
#include "drbd_protocol.h"
|
||||||
#include "drbd_req.h"
|
#include "drbd_req.h"
|
||||||
#include "drbd_wrappers.h"
|
|
||||||
#include <asm/unaligned.h>
|
#include <asm/unaligned.h>
|
||||||
#include <linux/drbd_limits.h>
|
#include <linux/drbd_limits.h>
|
||||||
#include <linux/kthread.h>
|
#include <linux/kthread.h>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
#include "drbd_wrappers.h"
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <net/netlink.h>
|
#include <net/netlink.h>
|
||||||
#include <linux/drbd_genl_api.h>
|
#include <linux/drbd_genl_api.h>
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,6 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/drbd.h>
|
#include <linux/drbd.h>
|
||||||
#include "drbd_int.h"
|
#include "drbd_int.h"
|
||||||
#include "drbd_wrappers.h"
|
|
||||||
|
|
||||||
/* The request callbacks will be called in irq context by the IDE drivers,
|
/* The request callbacks will be called in irq context by the IDE drivers,
|
||||||
and in Softirqs/Tasklets/BH context by the SCSI drivers,
|
and in Softirqs/Tasklets/BH context by the SCSI drivers,
|
||||||
|
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
#ifndef _DRBD_WRAPPERS_H
|
|
||||||
#define _DRBD_WRAPPERS_H
|
|
||||||
|
|
||||||
#include <linux/ctype.h>
|
|
||||||
#include <linux/mm.h>
|
|
||||||
#include "drbd_int.h"
|
|
||||||
|
|
||||||
/* see get_sb_bdev and bd_claim */
|
|
||||||
extern char *drbd_sec_holder;
|
|
||||||
|
|
||||||
/* 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define drbd_bio_uptodate(bio) bio_flagged(bio, BIO_UPTODATE)
|
|
||||||
|
|
||||||
/* 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);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef __CHECKER__
|
|
||||||
# undef __cond_lock
|
|
||||||
# define __cond_lock(x,c) (c)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Loading…
Add table
Reference in a new issue