devicemapper: A bug fix and a code improvement Upstream-commit: a3b04de401ec154048ce0aa7e86a4c239fd64439 Component: engine