[multipath] remove uneeded map resume upon reload
authorChristophe Varoqui <root@xa-s05.(none)>
Fri, 7 Oct 2005 09:27:02 +0000 (11:27 +0200)
committerChristophe Varoqui <root@xa-s05.(none)>
Fri, 7 Oct 2005 09:27:02 +0000 (11:27 +0200)
This sliped in recently.

multipath/main.c

index 63ec9818a45b73fe0a79680cf42ae78b053b7e29..652025aa2dbfdc6d4624febd4798040c50329385 100644 (file)
@@ -610,21 +610,20 @@ domap (struct multipath * mpp)
                break;
 
        case ACT_RELOAD:
-               r = dm_addmap(DM_DEVICE_RELOAD, mpp->alias, DEFAULT_TARGET,
-                             mpp->params, mpp->size, NULL);
+               r = (dm_addmap(DM_DEVICE_RELOAD, mpp->alias, DEFAULT_TARGET,
+                             mpp->params, mpp->size, NULL) &&
+                    dm_simplecmd(DM_DEVICE_RESUME, mpp->alias));
                break;
 
        default:
                break;
        }
 
-       if (r) {
+       if (r)
                /*
                 * DM_DEVICE_CREATE or DM_DEVICE_RELOAD succeeded
                 */
-               dm_simplecmd(DM_DEVICE_RESUME, mpp->alias);
                dm_switchgroup(mpp->alias, mpp->nextpg);
-       }
 
        return r;
 }