diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-01 09:16:41 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-01 09:16:41 -0700 |
| commit | eaddcfef1ba553744ae9293feaf7585ec9aaa0db (patch) | |
| tree | 1bfc22bf1e98b279ccf45af0ed065b9afd21fd98 /source3/modules/onefs_cbrl.c | |
| parent | 1e742660bf3fed39b7efa2502d88ee6415522385 (diff) | |
| parent | 264b28ec0962c355ee90f9ac67fcf07cd84c5c7b (diff) | |
| download | samba-eaddcfef1ba553744ae9293feaf7585ec9aaa0db.tar.gz samba-eaddcfef1ba553744ae9293feaf7585ec9aaa0db.tar.bz2 samba-eaddcfef1ba553744ae9293feaf7585ec9aaa0db.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/modules/onefs_cbrl.c')
| -rw-r--r-- | source3/modules/onefs_cbrl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/onefs_cbrl.c b/source3/modules/onefs_cbrl.c index a6178a9751..a196511427 100644 --- a/source3/modules/onefs_cbrl.c +++ b/source3/modules/onefs_cbrl.c @@ -324,7 +324,7 @@ NTSTATUS onefs_brl_lock_windows(vfs_handle_struct *handle, id = onefs_get_new_id(); } - DEBUG(10, ("Calling ifs_cbrl(LOCK)...")); + DEBUG(10, ("Calling ifs_cbrl(LOCK)...\n")); error = ifs_cbrl(fd, CBRL_OP_LOCK, type, plock->start, plock->size, async, id, plock->context.smbpid, plock->context.tid, plock->fnum); @@ -388,7 +388,7 @@ bool onefs_brl_unlock_windows(vfs_handle_struct *handle, SMB_ASSERT(plock->lock_flav == WINDOWS_LOCK); SMB_ASSERT(plock->lock_type == UNLOCK_LOCK); - DEBUG(10, ("Calling ifs_cbrl(UNLOCK)...")); + DEBUG(10, ("Calling ifs_cbrl(UNLOCK)...\n")); error = ifs_cbrl(fd, CBRL_OP_UNLOCK, CBRL_LK_SH, plock->start, plock->size, false, 0, plock->context.smbpid, plock->context.tid, plock->fnum); @@ -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; } @@ -443,7 +443,7 @@ bool onefs_brl_cancel_windows(vfs_handle_struct *handle, bs->state == ONEFS_CBRL_ASYNC); /* A real cancel. */ - DEBUG(10, ("Calling ifs_cbrl(CANCEL)...")); + DEBUG(10, ("Calling ifs_cbrl(CANCEL)...\n")); error = ifs_cbrl(fd, CBRL_OP_CANCEL, CBRL_LK_UNSPEC, plock->start, plock->size, false, bs->id, plock->context.smbpid, plock->context.tid, plock->fnum); |