[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1303-g218ec98

[Stefan Metzmacher]

The branch, v4-0-test has been updated
       via  218ec98a1694080748d1ac12baa90ffcda364833 (commit)
       via  055760f0f4aadd2079b0a4999b59ac3dbe5edf8a (commit)
       via  951764e28407a53ea4dd39d34388fab1b2259785 (commit)
       via  f555b8e4c35f69fdc1fb34427d882580eecad284 (commit)
      from  95ac786136aebfe5ededeb3fb81cbd4e296e3988 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 218ec98a1694080748d1ac12baa90ffcda364833
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Mar 15 12:36:20 2008 +0100

    pvfs_open: set h->have_opendb_entry directly after odb_open_file()
    
    Otherwise we may not clean up in the destructor.
    
    metze

commit 055760f0f4aadd2079b0a4999b59ac3dbe5edf8a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Mar 15 12:35:04 2008 +0100

    pvfs_open: the pvfs_odb_retry structs need to be children of the request
    
    Otherwise they're not cleaned up when the request is finished.
    
    metze

commit 951764e28407a53ea4dd39d34388fab1b2259785
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Mar 15 12:22:36 2008 +0100

    pvfs_unlink: disable async retries for wildcard deletes
    
    We would setup multiple retries per client request.
    
    metze

commit f555b8e4c35f69fdc1fb34427d882580eecad284
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Mar 15 12:21:06 2008 +0100

    messaging: fix a valgrind warning on 64bit hosts zero out padding
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/lib/messaging/messaging.c |    2 ++
 source/ntvfs/posix/pvfs_open.c   |    6 ++----
 source/ntvfs/posix/pvfs_unlink.c |    6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/messaging/messaging.c b/source/lib/messaging/messaging.c
index 6a879ab..29d6e00 100644
--- a/source/lib/messaging/messaging.c
+++ b/source/lib/messaging/messaging.c
@@ -462,6 +462,8 @@ NTSTATUS messaging_send(struct messaging_context *msg, struct server_id server,
 	rec->retries       = 0;
 	rec->msg              = msg;
 	rec->header           = (struct messaging_header *)rec->packet.data;
+	/* zero padding */
+	ZERO_STRUCTP(rec->header);
 	rec->header->version  = MESSAGING_VERSION;
 	rec->header->msg_type = msg_type;
 	rec->header->from     = msg->server_id;
diff --git a/source/ntvfs/posix/pvfs_open.c b/source/ntvfs/posix/pvfs_open.c
index 1399f12..6e77cb7 100644
--- a/source/ntvfs/posix/pvfs_open.c
+++ b/source/ntvfs/posix/pvfs_open.c
@@ -881,8 +881,6 @@ NTSTATUS pvfs_odb_retry_setup(struct ntvfs_module_context *ntvfs,
 
 	talloc_steal(r, wait_handle);
 
-	talloc_steal(pvfs, r);
-
 	return NT_STATUS_OK;
 }
 
@@ -1371,6 +1369,8 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
 		return status;
 	}
 
+	f->handle->have_opendb_entry = true;
+
 	if (pvfs->flags & PVFS_FLAG_FAKE_OPLOCKS) {
 		oplock_granted = OPLOCK_BATCH;
 	} else if (oplock_granted != OPLOCK_NONE) {
@@ -1381,8 +1381,6 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
 		}
 	}
 
-	f->handle->have_opendb_entry = true;
-
 	stream_existed = name->stream_exists;
 
 	/* if this was a stream create then create the stream as well */
diff --git a/source/ntvfs/posix/pvfs_unlink.c b/source/ntvfs/posix/pvfs_unlink.c
index 7a2d964..4cb47a4 100644
--- a/source/ntvfs/posix/pvfs_unlink.c
+++ b/source/ntvfs/posix/pvfs_unlink.c
@@ -219,6 +219,12 @@ NTSTATUS pvfs_unlink(struct ntvfs_module_context *ntvfs,
 		return pvfs_unlink_one(pvfs, req, unl, name);
 	}
 
+	/*
+	 * disable async requests in the wildcard case
+	 * untill we have proper tests for this
+	 */
+	req->async_states->state &= ~NTVFS_ASYNC_STATE_MAY_ASYNC;
+
 	/* get list of matching files */
 	status = pvfs_list_start(pvfs, name, req, &dir);
 	if (!NT_STATUS_IS_OK(status)) {


-- 
Samba Shared Repository