Merge "use passed blk dev name for quota / super block check"