Merge pull request #16698 from rhvgoyal/drop-redundant-lock

devmapper: Drop redundant lock and redundant function