fix queue freeze and limit locking order v3

[Martin K. Petersen]

Christoph,

> this is my version of Damien's "Fix queue freeze and limit locking
> order". A lot looks very similar, but it was done independently based
> on the previous discussion.

With the minor editorial changes addressed:

Reviewed-by: Martin K. Petersen <martin.petersen at oracle.com>

-- 
Martin K. Petersen	Oracle Linux Engineering