summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-04 12:12:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:29 -0500
commit8fa7f264c62eca51868307796cdfd2dcc0abceff (patch)
tree10e1fc5f5adf89de2f12bc17e53eba5f18e89fbb /source4
parentf71a4941f0184f2b5177cc1e67f8164116f19c41 (diff)
downloadsamba-8fa7f264c62eca51868307796cdfd2dcc0abceff.tar.gz
samba-8fa7f264c62eca51868307796cdfd2dcc0abceff.tar.bz2
samba-8fa7f264c62eca51868307796cdfd2dcc0abceff.zip
r3530: make sure we match ntvfs_async_state_pop() with ntvfs_async_state_push()
(This used to be commit 730ae0600e6c75a7048f7aaf3995604e8cdbba39)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/ntvfs_generic.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 885eb9719e..274d5caa87 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -247,7 +247,8 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
io->openx.out.access = OPENX_MODE_ACCESS_RDWR;
break;
default:
- return NT_STATUS_INVALID_LOCK_SEQUENCE;
+ status = NT_STATUS_INVALID_LOCK_SEQUENCE;
+ goto done;
}
switch (io->openx.in.open_mode & OPENX_MODE_DENY_MASK) {
@@ -280,7 +281,8 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
break;
default:
- return NT_STATUS_INVALID_LOCK_SEQUENCE;
+ status = NT_STATUS_INVALID_LOCK_SEQUENCE;
+ goto done;
}
switch (io->openx.in.open_func) {
@@ -306,7 +308,8 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
io2->generic.in.open_disposition = NTCREATEX_DISP_CREATE;
break;
}
- return NT_STATUS_INVALID_LOCK_SEQUENCE;
+ status = NT_STATUS_INVALID_LOCK_SEQUENCE;
+ goto done;
}
io2->generic.in.alloc_size = 0;
@@ -339,7 +342,8 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
default:
DEBUG(2,("ntvfs_map_open(OPEN): invalid mode 0x%x\n",
io->openold.in.flags & OPEN_FLAGS_MODE_MASK));
- return NT_STATUS_INVALID_PARAMETER;
+ status = NT_STATUS_INVALID_PARAMETER;
+ goto done;
}
switch (io->openold.in.flags & OPEN_FLAGS_DENY_MASK) {
@@ -375,16 +379,19 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
default:
DEBUG(2,("ntvfs_map_open(OPEN): invalid DENY 0x%x\n",
io->openold.in.flags & OPEN_FLAGS_DENY_MASK));
- return NT_STATUS_INVALID_PARAMETER;
+ status = NT_STATUS_INVALID_PARAMETER;
+ goto done;
}
status = ntvfs->ops->openfile(ntvfs, req, io2);
break;
default:
- return NT_STATUS_INVALID_LEVEL;
+ status = NT_STATUS_INVALID_LEVEL;
+ break;
}
+done:
return ntvfs_map_async_finish(req, status);
}
@@ -1080,7 +1087,8 @@ NTSTATUS ntvfs_map_read(struct smbsrv_request *req, union smb_read *rd,
lck = talloc_p(rd2, union smb_lock);
if (lck == NULL) {
- return NT_STATUS_NO_MEMORY;
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
}
lck->lock.level = RAW_LOCK_LOCK;
lck->lock.in.fnum = rd->lockread.in.fnum;
@@ -1102,6 +1110,7 @@ NTSTATUS ntvfs_map_read(struct smbsrv_request *req, union smb_read *rd,
break;
}
+done:
return ntvfs_map_async_finish(req, status);
}