From: Jeremy Allison <jra@samba.org>
Date: Fri, 13 Sep 2019 20:46:00 +0000 (-0700)
Subject: s3: VFS: vfs_fruit. Add struct files_struct *dirfsp parameter to fruit_unlink_meta_st... 
X-Git-Tag: talloc-2.3.1~601
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04ea1232996ddabe0ddb4a9dba56a7b8ba5262a2;p=thirdparty%2Fsamba.git

s3: VFS: vfs_fruit. Add struct files_struct *dirfsp parameter to fruit_unlink_meta_stream() and convert to UNLINKAT.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 892e2cbd3c1..4b78e391f25 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1776,9 +1776,13 @@ done:
 }
 
 static int fruit_unlink_meta_stream(vfs_handle_struct *handle,
-				    const struct smb_filename *smb_fname)
+				struct files_struct *dirfsp,
+				const struct smb_filename *smb_fname)
 {
-	return SMB_VFS_NEXT_UNLINK(handle, smb_fname);
+	return SMB_VFS_NEXT_UNLINKAT(handle,
+				dirfsp,
+				smb_fname,
+				0);
 }
 
 static int fruit_unlink_meta_netatalk(vfs_handle_struct *handle,
@@ -1801,7 +1805,9 @@ static int fruit_unlink_meta(vfs_handle_struct *handle,
 
 	switch (config->meta) {
 	case FRUIT_META_STREAM:
-		rc = fruit_unlink_meta_stream(handle, smb_fname);
+		rc = fruit_unlink_meta_stream(handle,
+				dirfsp,
+				smb_fname);
 		break;
 
 	case FRUIT_META_NETATALK: