This reverts commit c284ee2c.  Turns out
the locking was incorrect.
Reported-by: NFengguang Wu <fengguang.wu@intel.com>
Cc: Chao Bi <chao.bi@intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>