diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2013-11-22 10:48:14 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-07-10 09:22:21 -0400 |
commit | 28995af5cf3efd0bf4a74f5044cee0ae8cbc6b12 (patch) | |
tree | 776d00fc672b74c0cc5be59823a0b99a2c2fb798 /drivers/block/drbd | |
parent | 8fe39aac0578cbb0abf27e1be70ff581e0c1d836 (diff) |
drbd: rename drbd_free_bc() to drbd_free_ldev()
Since the member of drbd_device is called ldev
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r-- | drivers/block/drbd/drbd_int.h | 2 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 8 |
2 files changed, 5 insertions, 5 deletions
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 | |||
950 | extern int drbd_send_bitmap(struct drbd_device *device); | 950 | extern int drbd_send_bitmap(struct drbd_device *device); |
951 | extern void drbd_send_sr_reply(struct drbd_peer_device *, enum drbd_state_rv retcode); | 951 | extern void drbd_send_sr_reply(struct drbd_peer_device *, enum drbd_state_rv retcode); |
952 | extern void conn_send_sr_reply(struct drbd_connection *connection, enum drbd_state_rv retcode); | 952 | extern void conn_send_sr_reply(struct drbd_connection *connection, enum drbd_state_rv retcode); |
953 | extern void drbd_free_bc(struct drbd_backing_dev *ldev); | 953 | extern void drbd_free_ldev(struct drbd_backing_dev *ldev); |
954 | extern void drbd_device_cleanup(struct drbd_device *device); | 954 | extern void drbd_device_cleanup(struct drbd_device *device); |
955 | void drbd_print_uuids(struct drbd_device *device, const char *text); | 955 | void drbd_print_uuids(struct drbd_device *device, const char *text); |
956 | 956 | ||
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) | |||
1992 | drbd_bm_cleanup(device); | 1992 | drbd_bm_cleanup(device); |
1993 | } | 1993 | } |
1994 | 1994 | ||
1995 | drbd_free_bc(device->ldev); | 1995 | drbd_free_ldev(device->ldev); |
1996 | device->ldev = NULL; | 1996 | device->ldev = NULL; |
1997 | 1997 | ||
1998 | clear_bit(AL_SUSPENDED, &device->flags); | 1998 | clear_bit(AL_SUSPENDED, &device->flags); |
@@ -2187,7 +2187,7 @@ void drbd_destroy_device(struct kref *kref) | |||
2187 | if (device->this_bdev) | 2187 | if (device->this_bdev) |
2188 | bdput(device->this_bdev); | 2188 | bdput(device->this_bdev); |
2189 | 2189 | ||
2190 | drbd_free_bc(device->ldev); | 2190 | drbd_free_ldev(device->ldev); |
2191 | device->ldev = NULL; | 2191 | device->ldev = NULL; |
2192 | 2192 | ||
2193 | drbd_release_all_peer_reqs(device); | 2193 | drbd_release_all_peer_reqs(device); |
@@ -2960,7 +2960,7 @@ fail: | |||
2960 | return err; | 2960 | return err; |
2961 | } | 2961 | } |
2962 | 2962 | ||
2963 | void drbd_free_bc(struct drbd_backing_dev *ldev) | 2963 | void drbd_free_ldev(struct drbd_backing_dev *ldev) |
2964 | { | 2964 | { |
2965 | if (ldev == NULL) | 2965 | if (ldev == NULL) |
2966 | return; | 2966 | return; |
@@ -3533,7 +3533,7 @@ void drbd_ldev_destroy(struct drbd_device *device) | |||
3533 | lc_destroy(device->act_log); | 3533 | lc_destroy(device->act_log); |
3534 | device->act_log = NULL; | 3534 | device->act_log = NULL; |
3535 | __no_warn(local, | 3535 | __no_warn(local, |
3536 | drbd_free_bc(device->ldev); | 3536 | drbd_free_ldev(device->ldev); |
3537 | device->ldev = NULL;); | 3537 | device->ldev = NULL;); |
3538 | 3538 | ||
3539 | clear_bit(GO_DISKLESS, &device->flags); | 3539 | clear_bit(GO_DISKLESS, &device->flags); |