diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2014-04-28 12:43:14 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-04-30 15:46:54 -0400 |
| commit | d40e567149c7ac250344d1537261c87b2c3e852c (patch) | |
| tree | 83274d16f32c17896be811d0036784e933e99dd4 /drivers/block/drbd/drbd_int.h | |
| parent | d7fe69c6a1940c3f9c5bed08634b6dd868612cdf (diff) | |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_int.h')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index e7093d4291f1..361a2e9cd727 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
| @@ -1283,6 +1283,10 @@ extern void conn_try_outdate_peer_async(struct drbd_connection *connection); | |||
| 1283 | extern int drbd_khelper(struct drbd_device *device, char *cmd); | 1283 | extern int drbd_khelper(struct drbd_device *device, char *cmd); |
| 1284 | 1284 | ||
| 1285 | /* drbd_worker.c */ | 1285 | /* drbd_worker.c */ |
| 1286 | /* bi_end_io handlers */ | ||
| 1287 | extern void drbd_md_io_complete(struct bio *bio, int error); | ||
| 1288 | extern void drbd_peer_request_endio(struct bio *bio, int error); | ||
| 1289 | extern void drbd_request_endio(struct bio *bio, int error); | ||
| 1286 | extern int drbd_worker(struct drbd_thread *thi); | 1290 | extern int drbd_worker(struct drbd_thread *thi); |
| 1287 | enum drbd_ret_code drbd_resync_after_valid(struct drbd_device *device, int o_minor); | 1291 | enum drbd_ret_code drbd_resync_after_valid(struct drbd_device *device, int o_minor); |
| 1288 | void drbd_resync_after_changed(struct drbd_device *device); | 1292 | void drbd_resync_after_changed(struct drbd_device *device); |
| @@ -1401,6 +1405,37 @@ static inline void drbd_tcp_quickack(struct socket *sock) | |||
| 1401 | (char*)&val, sizeof(val)); | 1405 | (char*)&val, sizeof(val)); |
| 1402 | } | 1406 | } |
| 1403 | 1407 | ||
| 1408 | /* sets the number of 512 byte sectors of our virtual device */ | ||
| 1409 | static inline void drbd_set_my_capacity(struct drbd_device *device, | ||
| 1410 | sector_t size) | ||
| 1411 | { | ||
| 1412 | /* set_capacity(device->this_bdev->bd_disk, size); */ | ||
| 1413 | set_capacity(device->vdisk, size); | ||
| 1414 | device->this_bdev->bd_inode->i_size = (loff_t)size << 9; | ||
| 1415 | } | ||
| 1416 | |||
| 1417 | /* | ||
| 1418 | * used to submit our private bio | ||
| 1419 | */ | ||
| 1420 | static inline void drbd_generic_make_request(struct drbd_device *device, | ||
| 1421 | int fault_type, struct bio *bio) | ||
| 1422 | { | ||
| 1423 | __release(local); | ||
| 1424 | if (!bio->bi_bdev) { | ||
| 1425 | printk(KERN_ERR "drbd%d: drbd_generic_make_request: " | ||
| 1426 | "bio->bi_bdev == NULL\n", | ||
| 1427 | device_to_minor(device)); | ||
| 1428 | dump_stack(); | ||
| 1429 | bio_endio(bio, -ENODEV); | ||
| 1430 | return; | ||
| 1431 | } | ||
| 1432 | |||
| 1433 | if (drbd_insert_fault(device, fault_type)) | ||
| 1434 | bio_endio(bio, -EIO); | ||
| 1435 | else | ||
| 1436 | generic_make_request(bio); | ||
| 1437 | } | ||
| 1438 | |||
| 1404 | void drbd_bump_write_ordering(struct drbd_connection *connection, enum write_ordering_e wo); | 1439 | void drbd_bump_write_ordering(struct drbd_connection *connection, enum write_ordering_e wo); |
| 1405 | 1440 | ||
| 1406 | /* drbd_proc.c */ | 1441 | /* drbd_proc.c */ |
