LU-7860 ldlm: revert part of commit 657bbc49

LU-7860 ldlm: revert part of commit 657bbc49

During ldlm_lock_cancel()->ldlm_cancel_callback(), the lock could
possibly be added back to waiting list with no resource lock holding.

Put back the second checking and removing from the waiting list.

Signed-off-by: Bobi Jam <bobijam.xu@intel.com>
Change-Id: I8841422d6e2f6bf92efa24d542583936123ead66
Reviewed-on: http://review.whamcloud.com/20509
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Liang Zhen <liang.zhen@intel.com>
Reviewed-by: Vitaly Fertman <vitaly.fertman@seagate.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>