Eliminate a couple of holes in the structure, and move the 2 atomics
into the same cacheline.
Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>