a couple of lockdep fixes

This was triggering with vstart.sh .. -o 'lockdep = true'.  I'm not sure
why we weren't seeing this on the teuthology runs, though.  :/