]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3/libadouble: remove dirfsp arg from ad_convert_delete_adfile()
authorRalph Boehme <slow@samba.org>
Fri, 22 Jan 2021 16:06:26 +0000 (17:06 +0100)
committerJeremy Allison <jra@samba.org>
Thu, 28 Jan 2021 08:11:49 +0000 (08:11 +0000)
Going to open a dirfsp in the function itself in a later commit.

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

index 10b9bb1fb5d1938ff86dbdc248acd7d049e1ebd5..ac1ea2c3df1d02105e5a0095058b397d29658aad 100644 (file)
@@ -1371,7 +1371,6 @@ static bool ad_convert_blank_rfork(vfs_handle_struct *handle,
 
 static bool ad_convert_delete_adfile(vfs_handle_struct *handle,
                                struct adouble *ad,
-                               struct files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
                                uint32_t flags)
 {
@@ -1392,7 +1391,7 @@ static bool ad_convert_delete_adfile(vfs_handle_struct *handle,
        }
 
        rc = SMB_VFS_NEXT_UNLINKAT(handle,
-                       dirfsp,
+                       handle->conn->cwd_fsp,
                        ad_name,
                        0);
        if (rc != 0) {
@@ -1467,7 +1466,6 @@ int ad_convert(struct vfs_handle_struct *handle,
 
        ok = ad_convert_delete_adfile(handle,
                        ad,
-                       handle->conn->cwd_fsp,
                        smb_fname,
                        flags);
        if (!ok) {