From: Philipp Reisner Date: Fri, 22 Nov 2013 15:48:14 +0000 (+0100) Subject: drbd: rename drbd_free_bc() to drbd_free_ldev() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=28995af5cf3efd0bf4a74f5044cee0ae8cbc6b12;p=deliverable%2Flinux.git drbd: rename drbd_free_bc() to drbd_free_ldev() Since the member of drbd_device is called ldev Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index c87bc8e8fd82..82ece1b1a701 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -950,7 +950,7 @@ extern int drbd_send_ov_request(struct drbd_peer_device *, sector_t sector, int extern int drbd_send_bitmap(struct drbd_device *device); extern void drbd_send_sr_reply(struct drbd_peer_device *, enum drbd_state_rv retcode); extern void conn_send_sr_reply(struct drbd_connection *connection, enum drbd_state_rv retcode); -extern void drbd_free_bc(struct drbd_backing_dev *ldev); +extern void drbd_free_ldev(struct drbd_backing_dev *ldev); extern void drbd_device_cleanup(struct drbd_device *device); void drbd_print_uuids(struct drbd_device *device, const char *text); diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index a6af93528d57..8e0813ddf72a 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1992,7 +1992,7 @@ void drbd_device_cleanup(struct drbd_device *device) drbd_bm_cleanup(device); } - drbd_free_bc(device->ldev); + drbd_free_ldev(device->ldev); device->ldev = NULL; clear_bit(AL_SUSPENDED, &device->flags); @@ -2187,7 +2187,7 @@ void drbd_destroy_device(struct kref *kref) if (device->this_bdev) bdput(device->this_bdev); - drbd_free_bc(device->ldev); + drbd_free_ldev(device->ldev); device->ldev = NULL; drbd_release_all_peer_reqs(device); @@ -2960,7 +2960,7 @@ fail: return err; } -void drbd_free_bc(struct drbd_backing_dev *ldev) +void drbd_free_ldev(struct drbd_backing_dev *ldev) { if (ldev == NULL) return; @@ -3533,7 +3533,7 @@ void drbd_ldev_destroy(struct drbd_device *device) lc_destroy(device->act_log); device->act_log = NULL; __no_warn(local, - drbd_free_bc(device->ldev); + drbd_free_ldev(device->ldev); device->ldev = NULL;); clear_bit(GO_DISKLESS, &device->flags);