summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGoldwyn Rodrigues <rgoldwyn@suse.com>2015-07-22 12:09:16 -0500
committerNeilBrown <neilb@suse.com>2015-07-24 13:37:48 +1000
commitf7357273198adc86fe11c2a7be8a0816f44103bb (patch)
tree639ac99fb76688765b4eb5e8003b688525ac3e20
parent34cab6f42003cb06f48f86a86652984dec338ae9 (diff)
downloadop-kernel-dev-f7357273198adc86fe11c2a7be8a0816f44103bb.zip
op-kernel-dev-f7357273198adc86fe11c2a7be8a0816f44103bb.tar.gz
md: Skip cluster setup in case of error while reading bitmap
If the bitmap read fails, the error code set is -EINVAL. However, we don't check for errors and go ahead with cluster_setup. Skip the cluster setup in case of error. Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com> Signed-off-by: NeilBrown <neilb@suse.com>
-rw-r--r--drivers/md/bitmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index c90118e..a4ab513 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -680,7 +680,7 @@ out:
kunmap_atomic(sb);
/* Assiging chunksize is required for "re_read" */
bitmap->mddev->bitmap_info.chunksize = chunksize;
- if (nodes && (bitmap->cluster_slot < 0)) {
+ if (err == 0 && nodes && (bitmap->cluster_slot < 0)) {
err = md_setup_cluster(bitmap->mddev, nodes);
if (err) {
pr_err("%s: Could not setup cluster service (%d)\n",
OpenPOWER on IntegriCloud