diff options
| author | Zack Kirsch <zack.kirsch@isilon.com> | 2009-04-01 00:00:40 +0000 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-03-31 17:29:07 -0700 |
| commit | bfc7bb49ff0b842a1a372cee7d2affb49c2a0e54 (patch) | |
| tree | b3ff512194ad811823fa05899b996d2c31b2a1e2 | |
| parent | 42c0931441ef53a3f977e1334355fa83f05ac184 (diff) | |
| download | samba-bfc7bb49ff0b842a1a372cee7d2affb49c2a0e54.tar.gz samba-bfc7bb49ff0b842a1a372cee7d2affb49c2a0e54.tar.bz2 samba-bfc7bb49ff0b842a1a372cee7d2affb49c2a0e54.zip | |
s3 onefs: Async failures are resulting in SMB_ASSERT->smb_panic while running many of the LOCK torture tests.
Return true from the onefs cancel function if we've errored, which can happen
when the CBRL domain is configured to only give out 1 lock. :)
| -rw-r--r-- | source3/modules/onefs_cbrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/onefs_cbrl.c b/source3/modules/onefs_cbrl.c index a6178a9751..e30070a9f7 100644 --- a/source3/modules/onefs_cbrl.c +++ b/source3/modules/onefs_cbrl.c @@ -432,9 +432,9 @@ bool onefs_brl_cancel_windows(vfs_handle_struct *handle, bs = ((struct onefs_cbrl_blr_state *)blr->blr_private); SMB_ASSERT(bs); - if (bs->state == ONEFS_CBRL_DONE) { + if (bs->state == ONEFS_CBRL_DONE || bs->state == ONEFS_CBRL_ERROR) { /* No-op. */ - DEBUG(10, ("State=DONE, returning true\n")); + DEBUG(10, ("State=%d, returning true\n", bs->state)); END_PROFILE(syscall_brl_cancel); return true; } |