[dm-cache] another stab at the inc_ds() tidy up
[dm-thin] remove bogus thin_merge fn.

It wasn't adjusting the sector, which we can't do in a race free way.