From: Ralph Boehme <slow@samba.org>
Date: Thu, 23 May 2019 06:27:37 +0000 (+0200)
Subject: vfs_fruit: remove a layer of indirection
X-Git-Tag: samba-4.9.10~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=645836ff20af10a9be367a310ca3f12e9017ee70;p=thirdparty%2Fsamba.git

vfs_fruit: remove a layer of indirection

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13968

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 97d485ff2cda85edeba163ea01b6abfa705db20f)
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index bf1e901a2d3..9d0cd3cf727 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1580,9 +1580,10 @@ exit:
 	return ealen;
 }
 
-static int ad_open_rsrc_adouble(const struct smb_filename *smb_fname,
-				int flags,
-				mode_t mode)
+static int ad_open_rsrc(vfs_handle_struct *handle,
+			const struct smb_filename *smb_fname,
+			int flags,
+			mode_t mode)
 {
 	int ret;
 	int fd;
@@ -1599,14 +1600,6 @@ static int ad_open_rsrc_adouble(const struct smb_filename *smb_fname,
 	return fd;
 }
 
-static int ad_open_rsrc(vfs_handle_struct *handle,
-			const struct smb_filename *smb_fname,
-			int flags,
-			mode_t mode)
-{
-	return ad_open_rsrc_adouble(smb_fname, flags, mode);
-}
-
 /*
  * Here's the deal: for ADOUBLE_META we can do without an fd as we can issue
  * path based xattr calls. For ADOUBLE_RSRC however we need a full-fledged fd