diff options
-rw-r--r-- | drivers/block/drbd/drbd_nl.c | 8 | ||||
-rw-r--r-- | include/linux/drbd.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index abfaacaaf346..f7b5f7e86a57 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c | |||
@@ -1032,7 +1032,7 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp | |||
1032 | dev_err(DEV, "max capacity %llu smaller than disk size %llu\n", | 1032 | dev_err(DEV, "max capacity %llu smaller than disk size %llu\n", |
1033 | (unsigned long long) drbd_get_max_capacity(nbc), | 1033 | (unsigned long long) drbd_get_max_capacity(nbc), |
1034 | (unsigned long long) nbc->dc.disk_size); | 1034 | (unsigned long long) nbc->dc.disk_size); |
1035 | retcode = ERR_DISK_TO_SMALL; | 1035 | retcode = ERR_DISK_TOO_SMALL; |
1036 | goto fail; | 1036 | goto fail; |
1037 | } | 1037 | } |
1038 | 1038 | ||
@@ -1046,7 +1046,7 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp | |||
1046 | } | 1046 | } |
1047 | 1047 | ||
1048 | if (drbd_get_capacity(nbc->md_bdev) < min_md_device_sectors) { | 1048 | if (drbd_get_capacity(nbc->md_bdev) < min_md_device_sectors) { |
1049 | retcode = ERR_MD_DISK_TO_SMALL; | 1049 | retcode = ERR_MD_DISK_TOO_SMALL; |
1050 | dev_warn(DEV, "refusing attach: md-device too small, " | 1050 | dev_warn(DEV, "refusing attach: md-device too small, " |
1051 | "at least %llu sectors needed for this meta-disk type\n", | 1051 | "at least %llu sectors needed for this meta-disk type\n", |
1052 | (unsigned long long) min_md_device_sectors); | 1052 | (unsigned long long) min_md_device_sectors); |
@@ -1057,7 +1057,7 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp | |||
1057 | * (we may currently be R_PRIMARY with no local disk...) */ | 1057 | * (we may currently be R_PRIMARY with no local disk...) */ |
1058 | if (drbd_get_max_capacity(nbc) < | 1058 | if (drbd_get_max_capacity(nbc) < |
1059 | drbd_get_capacity(mdev->this_bdev)) { | 1059 | drbd_get_capacity(mdev->this_bdev)) { |
1060 | retcode = ERR_DISK_TO_SMALL; | 1060 | retcode = ERR_DISK_TOO_SMALL; |
1061 | goto fail; | 1061 | goto fail; |
1062 | } | 1062 | } |
1063 | 1063 | ||
@@ -1138,7 +1138,7 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp | |||
1138 | if (drbd_md_test_flag(nbc, MDF_CONSISTENT) && | 1138 | if (drbd_md_test_flag(nbc, MDF_CONSISTENT) && |
1139 | drbd_new_dev_size(mdev, nbc, 0) < nbc->md.la_size_sect) { | 1139 | drbd_new_dev_size(mdev, nbc, 0) < nbc->md.la_size_sect) { |
1140 | dev_warn(DEV, "refusing to truncate a consistent device\n"); | 1140 | dev_warn(DEV, "refusing to truncate a consistent device\n"); |
1141 | retcode = ERR_DISK_TO_SMALL; | 1141 | retcode = ERR_DISK_TOO_SMALL; |
1142 | goto force_diskless_dec; | 1142 | goto force_diskless_dec; |
1143 | } | 1143 | } |
1144 | 1144 | ||
diff --git a/include/linux/drbd.h b/include/linux/drbd.h index 9e5f5607eba3..cb8728b28432 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h | |||
@@ -112,8 +112,8 @@ enum drbd_ret_code { | |||
112 | ERR_OPEN_MD_DISK = 105, | 112 | ERR_OPEN_MD_DISK = 105, |
113 | ERR_DISK_NOT_BDEV = 107, | 113 | ERR_DISK_NOT_BDEV = 107, |
114 | ERR_MD_NOT_BDEV = 108, | 114 | ERR_MD_NOT_BDEV = 108, |
115 | ERR_DISK_TO_SMALL = 111, | 115 | ERR_DISK_TOO_SMALL = 111, |
116 | ERR_MD_DISK_TO_SMALL = 112, | 116 | ERR_MD_DISK_TOO_SMALL = 112, |
117 | ERR_BDCLAIM_DISK = 114, | 117 | ERR_BDCLAIM_DISK = 114, |
118 | ERR_BDCLAIM_MD_DISK = 115, | 118 | ERR_BDCLAIM_MD_DISK = 115, |
119 | ERR_MD_IDX_INVALID = 116, | 119 | ERR_MD_IDX_INVALID = 116, |