summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-03-07 18:28:48 +0100
committerStefan Metzmacher <metze@samba.org>2008-03-07 19:35:17 +0100
commitdb669e1eb13effb08b1111405587c8c6dde95954 (patch)
tree4c5bbb1cc620a7d823c935645d955a3552d1733f /source4
parente5e799aeb6b57ade1dd9c1a1d2c3aab1ad08d6df (diff)
downloadsamba-db669e1eb13effb08b1111405587c8c6dde95954.tar.gz
samba-db669e1eb13effb08b1111405587c8c6dde95954.tar.bz2
samba-db669e1eb13effb08b1111405587c8c6dde95954.zip
pvfs_open: fix the odb_open_file() callers
metze (This used to be commit 5fdca988c687f58fe2fddd3c8eff5f461207065b)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/posix/pvfs_open.c24
1 files changed, 8 insertions, 16 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index 1ed517c719..2e757e1742 100644
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -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)) {