diff options
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 2 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_nl.c | 4 | ||||
-rw-r--r-- | include/linux/drbd.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index f43e2aa354a6..8d69e3a1b3c2 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -3570,7 +3570,7 @@ void drbd_md_sync(struct drbd_conf *mdev) | |||
3570 | * @mdev: DRBD device. | 3570 | * @mdev: DRBD device. |
3571 | * @bdev: Device from which the meta data should be read in. | 3571 | * @bdev: Device from which the meta data should be read in. |
3572 | * | 3572 | * |
3573 | * Return 0 (NO_ERROR) on success, and an enum drbd_ret_codes in case | 3573 | * Return 0 (NO_ERROR) on success, and an enum drbd_ret_code in case |
3574 | * something goes wrong. Currently only: ERR_IO_MD_DISK, ERR_MD_INVALID. | 3574 | * something goes wrong. Currently only: ERR_IO_MD_DISK, ERR_MD_INVALID. |
3575 | */ | 3575 | */ |
3576 | int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev) | 3576 | int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev) |
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index cd0459f0403f..fe336592e538 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c | |||
@@ -849,7 +849,7 @@ static void drbd_suspend_al(struct drbd_conf *mdev) | |||
849 | static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp, | 849 | static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp, |
850 | struct drbd_nl_cfg_reply *reply) | 850 | struct drbd_nl_cfg_reply *reply) |
851 | { | 851 | { |
852 | enum drbd_ret_codes retcode; | 852 | enum drbd_ret_code retcode; |
853 | enum determine_dev_size dd; | 853 | enum determine_dev_size dd; |
854 | sector_t max_possible_sectors; | 854 | sector_t max_possible_sectors; |
855 | sector_t min_md_device_sectors; | 855 | sector_t min_md_device_sectors; |
@@ -1278,7 +1278,7 @@ static int drbd_nl_net_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp, | |||
1278 | struct drbd_nl_cfg_reply *reply) | 1278 | struct drbd_nl_cfg_reply *reply) |
1279 | { | 1279 | { |
1280 | int i, ns; | 1280 | int i, ns; |
1281 | enum drbd_ret_codes retcode; | 1281 | enum drbd_ret_code retcode; |
1282 | struct net_conf *new_conf = NULL; | 1282 | struct net_conf *new_conf = NULL; |
1283 | struct crypto_hash *tfm = NULL; | 1283 | struct crypto_hash *tfm = NULL; |
1284 | struct crypto_hash *integrity_w_tfm = NULL; | 1284 | struct crypto_hash *integrity_w_tfm = NULL; |
diff --git a/include/linux/drbd.h b/include/linux/drbd.h index 41da654cc0b1..d92f989036c9 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h | |||
@@ -103,7 +103,7 @@ enum drbd_on_congestion { | |||
103 | }; | 103 | }; |
104 | 104 | ||
105 | /* KEEP the order, do not delete or insert. Only append. */ | 105 | /* KEEP the order, do not delete or insert. Only append. */ |
106 | enum drbd_ret_codes { | 106 | enum drbd_ret_code { |
107 | ERR_CODE_BASE = 100, | 107 | ERR_CODE_BASE = 100, |
108 | NO_ERROR = 101, | 108 | NO_ERROR = 101, |
109 | ERR_LOCAL_ADDR = 102, | 109 | ERR_LOCAL_ADDR = 102, |