summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-02-22 09:23:53 +0100
committerStefan Metzmacher <metze@samba.org>2008-02-25 08:03:40 +0100
commita56bd4fa82bcb5c586f182e8123f2fc41b12e41d (patch)
tree28cef4e73448aad4cd6d42c4851ef35e128e1604 /source4/ntvfs
parent63b15441f4a5f636a079fa5407b2e97a8b99b6e2 (diff)
downloadsamba-a56bd4fa82bcb5c586f182e8123f2fc41b12e41d.tar.gz
samba-a56bd4fa82bcb5c586f182e8123f2fc41b12e41d.tar.bz2
samba-a56bd4fa82bcb5c586f182e8123f2fc41b12e41d.zip
pvfs_unlink: pass down union smb_unlink completely to sub functions
metze (This used to be commit 8301189e94be850494482e8c064b2400a5d11157)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/posix/pvfs_unlink.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/source4/ntvfs/posix/pvfs_unlink.c b/source4/ntvfs/posix/pvfs_unlink.c
index 101dd75de6..8dbf9ee724 100644
--- a/source4/ntvfs/posix/pvfs_unlink.c
+++ b/source4/ntvfs/posix/pvfs_unlink.c
@@ -29,8 +29,8 @@
*/
static NTSTATUS pvfs_unlink_stream(struct pvfs_state *pvfs,
struct ntvfs_request *req,
- struct pvfs_filename *name,
- uint16_t attrib)
+ union smb_unlink *unl,
+ struct pvfs_filename *name)
{
NTSTATUS status;
@@ -39,7 +39,8 @@ static NTSTATUS pvfs_unlink_stream(struct pvfs_state *pvfs,
}
/* make sure its matches the given attributes */
- status = pvfs_match_attrib(pvfs, name, attrib, 0);
+ status = pvfs_match_attrib(pvfs, name,
+ unl->unlink.in.attrib, 0);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@@ -58,13 +59,14 @@ static NTSTATUS pvfs_unlink_stream(struct pvfs_state *pvfs,
*/
static NTSTATUS pvfs_unlink_one(struct pvfs_state *pvfs,
struct ntvfs_request *req,
- struct pvfs_filename *name,
- uint32_t attrib)
+ union smb_unlink *unl,
+ struct pvfs_filename *name)
{
NTSTATUS status;
/* make sure its matches the given attributes */
- status = pvfs_match_attrib(pvfs, name, attrib, 0);
+ status = pvfs_match_attrib(pvfs, name,
+ unl->unlink.in.attrib, 0);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
@@ -133,7 +135,7 @@ NTSTATUS pvfs_unlink(struct ntvfs_module_context *ntvfs,
}
if (name->stream_name) {
- return pvfs_unlink_stream(pvfs, req, name, unl->unlink.in.attrib);
+ return pvfs_unlink_stream(pvfs, req, unl, name);
}
/* get list of matching files */
@@ -162,7 +164,7 @@ NTSTATUS pvfs_unlink(struct ntvfs_module_context *ntvfs,
return status;
}
- status = pvfs_unlink_one(pvfs, req, name, unl->unlink.in.attrib);
+ status = pvfs_unlink_one(pvfs, req, unl, name);
if (NT_STATUS_IS_OK(status)) {
total_deleted++;
}