From adc7ac38b849b4dce4a85fd6442c8d4b9da57686 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Fri, 17 May 2019 12:02:46 +0200 Subject: [PATCH] vfs_fruit: pass handle to ad_convert_blank_rfork() On the course of removing ad_handle from struct adouble, step 8. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13968 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- source3/modules/vfs_fruit.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 4f4f1f3b9fe..8cc3edbaecb 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -1347,7 +1347,8 @@ static bool ad_convert_truncate(struct adouble *ad, return true; } -static bool ad_convert_blank_rfork(struct adouble *ad, +static bool ad_convert_blank_rfork(vfs_handle_struct *handle, + struct adouble *ad, bool *blank) { struct fruit_config_data *config = NULL; @@ -1360,7 +1361,7 @@ static bool ad_convert_blank_rfork(struct adouble *ad, *blank = false; - SMB_VFS_HANDLE_GET_DATA(ad->ad_handle, config, + SMB_VFS_HANDLE_GET_DATA(handle, config, struct fruit_config_data, return false); if (!config->wipe_intentionally_left_blank_rfork) { @@ -1477,7 +1478,7 @@ static int ad_convert(struct vfs_handle_struct *handle, goto done; } - ok = ad_convert_blank_rfork(ad, &blank); + ok = ad_convert_blank_rfork(handle, ad, &blank); if (!ok) { ret = -1; goto done; -- 2.47.3