s3 onefs: Async failures are resulting in SMB_ASSERT->smb_panic while running many...
authorZack Kirsch <zack.kirsch@isilon.com>
Wed, 1 Apr 2009 00:00:40 +0000 (00:00 +0000)
committerTim Prouty <tprouty@samba.org>
Wed, 1 Apr 2009 00:29:07 +0000 (17:29 -0700)
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. :)

source3/modules/onefs_cbrl.c

index a6178a9751d4305dd8a405e92f950e15b844cae4..e30070a9f75df75884e82b1f81e7894a38a4a408 100644 (file)
@@ -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);
 
        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. */
                /* 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;
        }
                END_PROFILE(syscall_brl_cancel);
                return true;
        }