s3: VFS: vfs_fruit. Add struct files_struct *dirfsp parameter to fruit_unlink_meta_st...
authorJeremy Allison <jra@samba.org>
Fri, 13 Sep 2019 20:46:00 +0000 (13:46 -0700)
committerRalph Boehme <slow@samba.org>
Thu, 26 Sep 2019 17:20:49 +0000 (17:20 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/modules/vfs_fruit.c

index 892e2cbd3c18cc988898a21ce39c1cbffed75741..4b78e391f25aef2a6386baf0003af9e1a2c3dffb 100644 (file)
@@ -1776,9 +1776,13 @@ done:
 }
 
 static int fruit_unlink_meta_stream(vfs_handle_struct *handle,
-                                   const struct smb_filename *smb_fname)
+                               struct files_struct *dirfsp,
+                               const struct smb_filename *smb_fname)
 {
-       return SMB_VFS_NEXT_UNLINK(handle, smb_fname);
+       return SMB_VFS_NEXT_UNLINKAT(handle,
+                               dirfsp,
+                               smb_fname,
+                               0);
 }
 
 static int fruit_unlink_meta_netatalk(vfs_handle_struct *handle,
@@ -1801,7 +1805,9 @@ static int fruit_unlink_meta(vfs_handle_struct *handle,
 
        switch (config->meta) {
        case FRUIT_META_STREAM:
-               rc = fruit_unlink_meta_stream(handle, smb_fname);
+               rc = fruit_unlink_meta_stream(handle,
+                               dirfsp,
+                               smb_fname);
                break;
 
        case FRUIT_META_NETATALK: