pvfs_open: fix the odb_open_file() callers
authorStefan Metzmacher <metze@samba.org>
Fri, 7 Mar 2008 17:28:48 +0000 (18:28 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 7 Mar 2008 18:35:17 +0000 (19:35 +0100)
metze
(This used to be commit 5fdca988c687f58fe2fddd3c8eff5f461207065b)

source4/ntvfs/posix/pvfs_open.c

index 1ed517c7194d7668b1ea343b87a30a3d6e5be2fc..2e757e17425e18592f34f513ce1a86ab945a7125 100644 (file)
@@ -299,10 +299,8 @@ static NTSTATUS pvfs_open_directory(struct pvfs_state *pvfs,
                }
 
                /* now really mark the file as open */
-               status = odb_open_file(lck, f->handle, name->full_name, name->stream_id,
-                                      share_access, access_mask, del_on_close, 
-                                      io->generic.in.open_disposition,
-                                      false, false, OPLOCK_NONE, NULL);
+               status = odb_open_file(lck, f->handle, name->full_name,
+                                      false, OPLOCK_NONE, NULL);
 
                if (!NT_STATUS_IS_OK(status)) {
                        talloc_free(lck);
@@ -361,10 +359,8 @@ static NTSTATUS pvfs_open_directory(struct pvfs_state *pvfs,
                        goto cleanup_delete;
                }
 
-               status = odb_open_file(lck, f->handle, name->full_name, name->stream_id,
-                                      share_access, access_mask, del_on_close, 
-                                      io->generic.in.open_disposition,
-                                      false, false, OPLOCK_NONE, NULL);
+               status = odb_open_file(lck, f->handle, name->full_name,
+                                      false, OPLOCK_NONE, NULL);
 
                if (!NT_STATUS_IS_OK(status)) {
                        goto cleanup_delete;
@@ -692,10 +688,8 @@ static NTSTATUS pvfs_create_file(struct pvfs_state *pvfs,
                return status;
        }
 
-       status = odb_open_file(lck, f->handle, name->full_name, name->stream_id,
-                              share_access, access_mask, del_on_close, 
-                              io->generic.in.open_disposition,
-                              false, allow_level_II_oplock,
+       status = odb_open_file(lck, f->handle, name->full_name,
+                              allow_level_II_oplock,
                               oplock_level, &oplock_granted);
        talloc_free(lck);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1304,10 +1298,8 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
        }
 
        /* now really mark the file as open */
-       status = odb_open_file(lck, f->handle, name->full_name, name->stream_id,
-                              share_access, access_mask, del_on_close,
-                              io->generic.in.open_disposition,
-                              false, allow_level_II_oplock,
+       status = odb_open_file(lck, f->handle, name->full_name,
+                              allow_level_II_oplock,
                               oplock_level, &oplock_granted);
 
        if (!NT_STATUS_IS_OK(status)) {