[sr-dev] git:5.8:814f5bdc: dmq: fix inter-lock on error