summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-03-15 12:36:20 +0100
committerStefan Metzmacher <metze@samba.org>2008-03-15 12:36:20 +0100
commite76c8aa097d9865f97b254be7477f2097ea86e7d (patch)
treef7946a65009422162f5ecd2b75a230e5931ac035 /source4
parent74d940ca5742a021a01e8820be40a69366f67ee6 (diff)
downloadsamba-e76c8aa097d9865f97b254be7477f2097ea86e7d.tar.gz
samba-e76c8aa097d9865f97b254be7477f2097ea86e7d.tar.bz2
samba-e76c8aa097d9865f97b254be7477f2097ea86e7d.zip
pvfs_open: set h->have_opendb_entry directly after odb_open_file()
Otherwise we may not clean up in the destructor. metze (This used to be commit 218ec98a1694080748d1ac12baa90ffcda364833)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/posix/pvfs_open.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index d1cb0eb603..6e77cb7c75 100644
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -1369,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) {
@@ -1379,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 */