[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-794-g7424665
Tim Prouty
tprouty at samba.org
Wed Apr 1 01:05:13 GMT 2009
The branch, master has been updated
via 74246650613cca9ec57c9a0eff75c53a5c15b110 (commit)
via bfc7bb49ff0b842a1a372cee7d2affb49c2a0e54 (commit)
via 42c0931441ef53a3f977e1334355fa83f05ac184 (commit)
from 62f12e2322f1f14cf359fa39a822cd478256cf01 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 74246650613cca9ec57c9a0eff75c53a5c15b110
Author: Tim Prouty <tprouty at samba.org>
Date: Wed Apr 1 00:25:57 2009 +0000
s3 onefs: Add missing newlines to debug statements in the onefs module
commit bfc7bb49ff0b842a1a372cee7d2affb49c2a0e54
Author: Zack Kirsch <zack.kirsch at isilon.com>
Date: Wed Apr 1 00:00:40 2009 +0000
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. :)
commit 42c0931441ef53a3f977e1334355fa83f05ac184
Author: Tim Prouty <tprouty at samba.org>
Date: Tue Mar 31 16:24:07 2009 -0700
tdb: Remove unused variable
-----------------------------------------------------------------------
Summary of changes:
lib/tdb/common/transaction.c | 1 -
source3/modules/onefs_cbrl.c | 10 +++++-----
source3/modules/onefs_config.c | 6 +++---
source3/modules/onefs_open.c | 9 +++++----
source3/modules/onefs_system.c | 10 +++++-----
5 files changed, 18 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c
index 1cb7063..cb723ed 100644
--- a/lib/tdb/common/transaction.c
+++ b/lib/tdb/common/transaction.c
@@ -864,7 +864,6 @@ static int transaction_setup_recovery(struct tdb_context *tdb,
int tdb_transaction_prepare_commit(struct tdb_context *tdb)
{
const struct tdb_methods *methods;
- int i;
if (tdb->transaction == NULL) {
TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_prepare_commit: no transaction\n"));
diff --git a/source3/modules/onefs_cbrl.c b/source3/modules/onefs_cbrl.c
index a6178a9..a196511 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);
diff --git a/source3/modules/onefs_config.c b/source3/modules/onefs_config.c
index 06f4b16..6fe74fc 100644
--- a/source3/modules/onefs_config.c
+++ b/source3/modules/onefs_config.c
@@ -234,7 +234,7 @@ void onefs_sys_config_enc(void)
ret = enc_set_proc(ENC_UTF8);
if (ret) {
- DEBUG(0, ("Setting process encoding failed: %s",
+ DEBUG(0, ("Setting process encoding failed: %s\n",
strerror(errno)));
}
}
@@ -256,7 +256,7 @@ void onefs_sys_config_snap_opt(struct onefs_vfs_global_config *global_config)
ret = ifs_set_dotsnap_options(&dso);
if (ret) {
DEBUG(0, ("Setting snapshot visibility/accessibility "
- "failed: %s", strerror(errno)));
+ "failed: %s\n", strerror(errno)));
}
}
@@ -270,7 +270,7 @@ void onefs_sys_config_tilde(struct onefs_vfs_global_config *global_config)
ret = ifs_tilde_snapshot(global_config->dot_snap_tilde);
if (ret) {
- DEBUG(0, ("Setting snapshot tilde failed: %s",
+ DEBUG(0, ("Setting snapshot tilde failed: %s\n",
strerror(errno)));
}
}
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index c23c176..d628443 100644
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -207,10 +207,11 @@ static NTSTATUS onefs_open_file(files_struct *fsp,
*/
if ((oplock_request & ~SAMBA_PRIVATE_OPLOCK_MASK) !=
NO_OPLOCK) {
- DEBUG(0,("Oplock(%d) being requested on a stream! "
- "Ignoring oplock request: base=%s, stream=%s\n",
- oplock_request & ~SAMBA_PRIVATE_OPLOCK_MASK,
- base, stream));
+ DEBUG(0, ("Oplock(%d) being requested on a stream! "
+ "Ignoring oplock request: base=%s, "
+ "stream=%s\n",
+ oplock_request & ~SAMBA_PRIVATE_OPLOCK_MASK,
+ base, stream));
/* Recover by requesting NO_OPLOCK instead. */
oplock_request &= SAMBA_PRIVATE_OPLOCK_MASK;
}
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c
index 46f3826..bc2ed46 100644
--- a/source3/modules/onefs_system.c
+++ b/source3/modules/onefs_system.c
@@ -110,7 +110,7 @@ int onefs_sys_create_file(connection_struct *conn,
status = onefs_samba_sd_to_sd(secinfo, sd, &ifs_sd, SNUM(conn));
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("SD initialization failure: %s",
+ DEBUG(1, ("SD initialization failure: %s\n",
nt_errstr(status)));
errno = EINVAL;
goto out;
@@ -162,11 +162,11 @@ int onefs_sys_create_file(connection_struct *conn,
open_access_mask));
}
- DEBUG(10,("onefs_sys_create_file: base_fd = %d, "
+ DEBUG(10,("onefs_sys_create_file: base_fd = %d, fname = %s"
"open_access_mask = 0x%x, flags = 0x%x, mode = 0%o, "
"desired_oplock = %s, id = 0x%x, secinfo = 0x%x, sd = %p, "
"dos_attributes = 0x%x, path = %s, "
- "default_acl=%s\n", base_fd,
+ "default_acl=%s\n", base_fd, path,
(unsigned int)open_access_mask,
(unsigned int)flags,
(unsigned int)mode,
@@ -328,7 +328,7 @@ ssize_t onefs_sys_sendfile(connection_struct *conn, int tofd, int fromfd,
/* If the sendfile wasn't atomic, we're done. */
if (!atomic) {
- DEBUG(10, ("non-atomic sendfile read %ul bytes", ret));
+ DEBUG(10, ("non-atomic sendfile read %ul bytes\n", ret));
END_PROFILE(syscall_sendfile);
return ret;
}
@@ -418,7 +418,7 @@ ssize_t onefs_sys_sendfile(connection_struct *conn, int tofd, int fromfd,
}
if (count < 0x10000) {
- DEBUG(0, ("Count < 2^16 and E2BIG was returned! %lu",
+ DEBUG(0, ("Count < 2^16 and E2BIG was returned! %lu\n",
count));
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list