[sr-dev] git:5.5:fa08fabe: dmq: fix inter-lock on error