Make sure that we release all the locks when state_nlm_notify()
is called through ipmove/recovery.

Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
Signed-off-by: Poornima Gupte <poornima.gupte@in.ibm.com>
Merge branch 'tp/S1052230' into ibm_next_tmp
Merge branch 'tp/ibm_next_S1048601' into ibm_next_tmp