]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vfs_fruit: remove a layer of indirection
authorRalph Boehme <slow@samba.org>
Thu, 23 May 2019 06:27:37 +0000 (08:27 +0200)
committerKarolin Seeger <kseeger@samba.org>
Fri, 21 Jun 2019 07:56:20 +0000 (07:56 +0000)
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)

source3/modules/vfs_fruit.c

index bf1e901a2d3c389bb139496b28d75512fd7eb81b..9d0cd3cf727e680158ec6dc667e38ae0ba20f342 100644 (file)
@@ -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