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

s3/libadouble: remove dirfsp arg from ad_convert()

ad_convert() doesn't really need the dirfsp in most places. Only
ad_convert_delete_adfile() would use it, so instead open a dirfsp internally for
this function 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 e869965876d..10b9bb1fb5d 100644
--- a/source3/lib/adouble.c
+++ b/source3/lib/adouble.c
@@ -1418,7 +1418,6 @@ static bool ad_convert_delete_adfile(vfs_handle_struct *handle,
  * otherwise
  **/
 int ad_convert(struct vfs_handle_struct *handle,
-		struct files_struct *dirfsp,
 		const struct smb_filename *smb_fname,
 		const char *catia_mappings,
 		uint32_t flags)
@@ -1468,7 +1467,7 @@ int ad_convert(struct vfs_handle_struct *handle,
 
 	ok = ad_convert_delete_adfile(handle,
 			ad,
-			dirfsp,
+			handle->conn->cwd_fsp,
 			smb_fname,
 			flags);
 	if (!ok) {
diff --git a/source3/lib/adouble.h b/source3/lib/adouble.h
index a5761281670..040568a44b6 100644
--- a/source3/lib/adouble.h
+++ b/source3/lib/adouble.h
@@ -154,7 +154,6 @@ char *ad_get_entry(const struct adouble *ad, int eid);
 int ad_getdate(const struct adouble *ad, unsigned int dateoff, uint32_t *date);
 int ad_setdate(struct adouble *ad, unsigned int dateoff, uint32_t date);
 int ad_convert(struct vfs_handle_struct *handle,
-		struct files_struct *dirfsp,
 		const struct smb_filename *smb_fname,
 		const char *catia_mappings,
 		uint32_t flags);
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 6e8a785d91f..529741d2611 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -4094,7 +4094,6 @@ static NTSTATUS fruit_create_file(vfs_handle_struct *handle,
 		}
 
 		ret = ad_convert(handle,
-				 handle->conn->cwd_fsp,
 				 smb_fname,
 				 macos_string_replace_map,
 				 conv_flags);
@@ -4203,7 +4202,6 @@ static NTSTATUS fruit_readdir_attr(struct vfs_handle_struct *handle,
 	}
 
 	ret = ad_convert(handle,
-			handle->conn->cwd_fsp,
 			fname,
 			macos_string_replace_map,
 			conv_flags);