NFSv4: Ensure nfs4_lock_expired() caches delegated locks

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

+5 -3
+5 -3
fs/nfs/nfs4proc.c
··· 3454 3454 struct nfs4_exception exception = { }; 3455 3455 int err; 3456 3456 3457 - /* Cache the lock if possible... */ 3458 - if (test_bit(NFS_DELEGATED_STATE, &state->flags)) 3459 - return 0; 3460 3457 do { 3458 + /* Cache the lock if possible... */ 3459 + if (test_bit(NFS_DELEGATED_STATE, &state->flags) != 0) 3460 + return 0; 3461 3461 err = _nfs4_do_setlk(state, F_SETLK, request, 1); 3462 3462 if (err != -NFS4ERR_DELAY) 3463 3463 break; ··· 3476 3476 if (err != 0) 3477 3477 return err; 3478 3478 do { 3479 + if (test_bit(NFS_DELEGATED_STATE, &state->flags) != 0) 3480 + return 0; 3479 3481 err = _nfs4_do_setlk(state, F_SETLK, request, 0); 3480 3482 if (err != -NFS4ERR_DELAY) 3481 3483 break;