Revert "HACK pass s4 create_action..."

This reverts commit 8b4880e53acedc2d3b6734c43154ed5be216e1f2.

diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c
index cb0b5c4539c2e8aa85191f8bb3b4fe88c9ed11f5..ce270b41273d5ec7c0e6e96089100feef65bb11c 100644 (file)
--- a/source4/ntvfs/common/opendb_tdb.c
+++ b/source4/ntvfs/common/opendb_tdb.c
@@ -435,7 +435,6 @@ static NTSTATUS odb_tdb_open_can_internal(struct odb_context *odb,
 static NTSTATUS odb_tdb_open_file(struct odb_lock *lck,
                                  void *file_handle, const char *path,
                                  int *fd, NTTIME open_write_time,
-                                 uint32_t create_action,
                                  bool allow_level_II_oplock,
                                  uint32_t oplock_level, uint32_t *oplock_granted)
 {
@@ -512,10 +511,6 @@ static NTSTATUS odb_tdb_open_file(struct odb_lock *lck,
                }
        }
 
-       if (lck->file.num_entries == 0) {
-               lck->file.create_action = create_action;
-       }
-
        /* it doesn't conflict, so add it to the end */
        lck->file.entries = talloc_realloc(lck, lck->file.entries,
                                           struct opendb_entry,

diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index c75739daa511e4d71632c6f03b3ca547d49a7d5a..48d2712315f55ca3801f18aaf9ce9205767271bf 100644 (file)
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -812,7 +812,7 @@ static NTSTATUS pvfs_create_file(struct pvfs_state *pvfs,
 
        status = odb_open_file(lck, f->handle, name->full_name,
                               &f->handle->fd, name->dos.write_time,
-                              allow_level_II_oplock, was_created,
+                              allow_level_II_oplock,
                               oplock_level, &oplock_granted);
        talloc_free(lck);
        if (!NT_STATUS_IS_OK(status)) {