From: Zack Kirsch <zack.kirsch@isilon.com>
Date: Wed, 1 Apr 2009 00:00:40 +0000 (+0000)
Subject: s3 onefs: Async failures are resulting in SMB_ASSERT->smb_panic while running many... 
X-Git-Tag: tdb-1.1.5~1036^2~13
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=bfc7bb49ff0b842a1a372cee7d2affb49c2a0e54;hp=42c0931441ef53a3f977e1334355fa83f05ac184

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. :)
---

diff --git a/source3/modules/onefs_cbrl.c b/source3/modules/onefs_cbrl.c
index a6178a9751d..e30070a9f75 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;
 	}