From d5414cdc63b797a47fcbd1f55df98c7dd850ffa6 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 22 Feb 2008 09:28:51 +0100
Subject: pvfs_unlink: move !name->stream_exists into the caller

metze
(This used to be commit e01554e1617dc3c08a4ed6b4e016fd627f529ef9)
---
 source4/ntvfs/posix/pvfs_unlink.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/ntvfs/posix/pvfs_unlink.c')

diff --git a/source4/ntvfs/posix/pvfs_unlink.c b/source4/ntvfs/posix/pvfs_unlink.c
index 8dbf9ee724..2b96a5032c 100644
--- a/source4/ntvfs/posix/pvfs_unlink.c
+++ b/source4/ntvfs/posix/pvfs_unlink.c
@@ -34,10 +34,6 @@ static NTSTATUS pvfs_unlink_stream(struct pvfs_state *pvfs,
 {
 	NTSTATUS status;
 
-	if (!name->stream_exists) {
-		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
-	}
-
 	/* make sure its matches the given attributes */
 	status = pvfs_match_attrib(pvfs, name,
 				   unl->unlink.in.attrib, 0);
@@ -135,6 +131,10 @@ NTSTATUS pvfs_unlink(struct ntvfs_module_context *ntvfs,
 	}
 
 	if (name->stream_name) {
+		if (!name->stream_exists) {
+			return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+		}
+
 		return pvfs_unlink_stream(pvfs, req, unl, name);
 	}
 
-- 
cgit