s3: VFS: vfs_fruit. Wrap Convert fruit_unlink() -> fruit_unlink_internal() so we...
authorJeremy Allison <jra@samba.org>
Fri, 13 Sep 2019 20:16:19 +0000 (13:16 -0700)
committerRalph Boehme <slow@samba.org>
Thu, 26 Sep 2019 17:20:49 +0000 (17:20 +0000)
Make fruit_unlink() a wrapper calling the internal version.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/modules/vfs_fruit.c

index ea00bbbd1ccb406ffbdcad4c51c6d480a46461e0..38aedbc01e7a99399c7b5f7b904434ed9421a34c 100644 (file)
@@ -1951,7 +1951,7 @@ static int fruit_unlink_rsrc(vfs_handle_struct *handle,
        return rc;
 }
 
-static int fruit_unlink(vfs_handle_struct *handle,
+static int fruit_unlink_internal(vfs_handle_struct *handle,
                        const struct smb_filename *smb_fname)
 {
        int rc;
@@ -2165,6 +2165,12 @@ exit_rmdir:
        return SMB_VFS_NEXT_RMDIR(handle, smb_fname);
 }
 
+static int fruit_unlink(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname)
+{
+       return fruit_unlink_internal(handle, smb_fname);
+}
+
 static int fruit_unlinkat(vfs_handle_struct *handle,
                        struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
@@ -2176,7 +2182,7 @@ static int fruit_unlinkat(vfs_handle_struct *handle,
        if (flags & AT_REMOVEDIR) {
                ret = fruit_rmdir(handle, smb_fname);
        } else {
-               ret = fruit_unlink(handle, smb_fname);
+               ret = fruit_unlink_internal(handle, smb_fname);
        }
        return ret;
 }