Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / include / linux / drbd.h

diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index debb70d4054757e44e291064fd73d362e738b68b..8723f2a99e1588d7feba41625ebdbc9c924e94d0 100644 (file)
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -172,7 +172,7 @@ enum drbd_ret_code {
        ERR_RES_NOT_KNOWN       = 158,
        ERR_RES_IN_USE          = 159,
        ERR_MINOR_CONFIGURED    = 160,
-       ERR_MINOR_EXISTS        = 161,
+       ERR_MINOR_OR_VOLUME_EXISTS = 161,
        ERR_INVALID_REQUEST     = 162,
        ERR_NEED_APV_100        = 163,
        ERR_NEED_ALLOW_TWO_PRI  = 164,