From e76c8aa097d9865f97b254be7477f2097ea86e7d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 15 Mar 2008 12:36:20 +0100 Subject: 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) --- source4/ntvfs/posix/pvfs_open.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/ntvfs/posix/pvfs_open.c') diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index d1cb0eb6034..6e77cb7c756 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 */ -- cgit