block, cfq: fix race condition in cic creation path and tighten locking