From: Ralph Boehme <slow@samba.org>
Date: Fri, 22 Jan 2021 16:06:26 +0000 (+0100)
Subject: s3/libadouble: remove dirfsp arg from ad_convert_delete_adfile()
X-Git-Tag: tevent-0.11.0~1892
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00ec67eb0ca400ea447dbb8dff8a003744cbd53e;p=thirdparty%2Fsamba.git

s3/libadouble: remove dirfsp arg from ad_convert_delete_adfile()

Going to open a dirfsp in the function itself in a later commit.

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

diff --git a/source3/lib/adouble.c b/source3/lib/adouble.c
index 10b9bb1fb5d..ac1ea2c3df1 100644
--- a/source3/lib/adouble.c
+++ b/source3/lib/adouble.c
@@ -1371,7 +1371,6 @@ static bool ad_convert_blank_rfork(vfs_handle_struct *handle,
 
 static bool ad_convert_delete_adfile(vfs_handle_struct *handle,
 				struct adouble *ad,
-				struct files_struct *dirfsp,
 				const struct smb_filename *smb_fname,
 				uint32_t flags)
 {
@@ -1392,7 +1391,7 @@ static bool ad_convert_delete_adfile(vfs_handle_struct *handle,
 	}
 
 	rc = SMB_VFS_NEXT_UNLINKAT(handle,
-			dirfsp,
+			handle->conn->cwd_fsp,
 			ad_name,
 			0);
 	if (rc != 0) {
@@ -1467,7 +1466,6 @@ int ad_convert(struct vfs_handle_struct *handle,
 
 	ok = ad_convert_delete_adfile(handle,
 			ad,
-			handle->conn->cwd_fsp,
 			smb_fname,
 			flags);
 	if (!ok) {