Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[cascardo/linux.git] / drivers / block / drbd / drbd_main.c

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 973c185..1fc8342 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2532,10 +2532,6 @@ int set_resource_options(struct drbd_resource *resource, struct res_opts *res_op
 
        if (!zalloc_cpumask_var(&new_cpu_mask, GFP_KERNEL))
                return -ENOMEM;
-               /*
-               retcode = ERR_NOMEM;
-               drbd_msg_put_info("unable to allocate cpumask");
-               */
 
        /* silently ignore cpu mask on UP kernel */
        if (nr_cpu_ids > 1 && res_opts->cpu_mask[0] != 0) {
@@ -2731,7 +2727,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
 
        device = minor_to_device(minor);
        if (device)
-               return ERR_MINOR_EXISTS;
+               return ERR_MINOR_OR_VOLUME_EXISTS;
 
        /* GFP_KERNEL, we are outside of all write-out paths */
        device = kzalloc(sizeof(struct drbd_device), GFP_KERNEL);
@@ -2793,20 +2789,16 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
 
        id = idr_alloc(&drbd_devices, device, minor, minor + 1, GFP_KERNEL);
        if (id < 0) {
-               if (id == -ENOSPC) {
-                       err = ERR_MINOR_EXISTS;
-                       drbd_msg_put_info(adm_ctx->reply_skb, "requested minor exists already");
-               }
+               if (id == -ENOSPC)
+                       err = ERR_MINOR_OR_VOLUME_EXISTS;
                goto out_no_minor_idr;
        }
        kref_get(&device->kref);
 
        id = idr_alloc(&resource->devices, device, vnr, vnr + 1, GFP_KERNEL);
        if (id < 0) {
-               if (id == -ENOSPC) {
-                       err = ERR_MINOR_EXISTS;
-                       drbd_msg_put_info(adm_ctx->reply_skb, "requested minor exists already");
-               }
+               if (id == -ENOSPC)
+                       err = ERR_MINOR_OR_VOLUME_EXISTS;
                goto out_idr_remove_minor;
        }
        kref_get(&device->kref);
@@ -2825,10 +2817,8 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
 
                id = idr_alloc(&connection->peer_devices, peer_device, vnr, vnr + 1, GFP_KERNEL);
                if (id < 0) {
-                       if (id == -ENOSPC) {
+                       if (id == -ENOSPC)
                                err = ERR_INVALID_REQUEST;
-                               drbd_msg_put_info(adm_ctx->reply_skb, "requested volume exists already");
-                       }
                        goto out_idr_remove_from_resource;
                }
                kref_get(&connection->kref);
@@ -2836,7 +2826,6 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
 
        if (init_submitter(device)) {
                err = ERR_NOMEM;
-               drbd_msg_put_info(adm_ctx->reply_skb, "unable to create submit workqueue");
                goto out_idr_remove_vol;
        }