s3: smbd: Now we have proved hardlink_internals() doesn't use src_dirfsp and dst_dirf...

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Tue Sep 19 19:51:47 UTC 2023 on atb-devel-224

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 17d48a757fa05a414150165f25f876bed29a1549..04b1b053ae6fd45be219cf4b411e4ff955294d7e 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1125,9 +1125,7 @@ NTSTATUS hardlink_internals(TALLOC_CTX *ctx,
                connection_struct *conn,
                struct smb_request *req,
                bool overwrite_if_exists,
-               struct files_struct *old_dirfsp,
                const struct smb_filename *smb_fname_old,
-               struct files_struct *new_dirfsp,
                struct smb_filename *smb_fname_new);
 NTSTATUS smb_set_file_time(connection_struct *conn,
                           files_struct *fsp,

diff --git a/source3/smbd/smb1_nttrans.c b/source3/smbd/smb1_nttrans.c
index c75a30ebbf40dd15809f26c4cde31283e4eeb895..104d3c096567a06dc2b8dfdbcb74891b62b2a486 100644 (file)
--- a/source3/smbd/smb1_nttrans.c
+++ b/source3/smbd/smb1_nttrans.c
@@ -1588,9 +1588,7 @@ void reply_ntrename(struct smb_request *req)
                                                    conn,
                                                    req,
                                                    false,
-                                                   NULL,
                                                    smb_fname_old,
-                                                   NULL,
                                                    smb_fname_new);
                        break;
                case RENAME_FLAG_COPY:

diff --git a/source3/smbd/smb1_trans2.c b/source3/smbd/smb1_trans2.c
index 47493d57904ef746a15b66e7e56a1ecf59593cc3..3f8ad70eccec6b649b126aedf9c948c5e405dd70 100644 (file)
--- a/source3/smbd/smb1_trans2.c
+++ b/source3/smbd/smb1_trans2.c
@@ -3861,9 +3861,7 @@ static NTSTATUS smb_set_file_unix_hlink(connection_struct *conn,
                                  conn,
                                  req,
                                  false,
-                                 NULL,
                                  smb_fname_old,
-                                 NULL, /* new_dirfsp */
                                  smb_fname_new);
 }
 

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index 7baf420bdd0a42b2eadd9110cf1f6887ab1bfa3c..4b0c43f934184bf3cdad1e192075de41c6e85a90 100644 (file)
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -3724,9 +3724,7 @@ NTSTATUS hardlink_internals(TALLOC_CTX *ctx,
                connection_struct *conn,
                struct smb_request *req,
                bool overwrite_if_exists,
-               struct files_struct *old_dirfsp,
                const struct smb_filename *smb_fname_old,
-               struct files_struct *new_dirfsp,
                struct smb_filename *smb_fname_new)
 {
        NTSTATUS status = NT_STATUS_OK;
@@ -4471,9 +4469,7 @@ static NTSTATUS smb2_file_link_information(connection_struct *conn,
                                conn,
                                req,
                                overwrite,
-                               NULL, /* src_dirfsp */
                                fsp->fsp_name,
-                               NULL, /* dst_dirfsp */
                                smb_fname_dst);
 
        TALLOC_FREE(smb_fname_dst);
@@ -4569,9 +4565,7 @@ static NTSTATUS smb_file_link_information(connection_struct *conn,
                                conn,
                                req,
                                overwrite,
-                               NULL, /* src_dirfsp */
                                fsp->fsp_name,
-                               NULL, /* dst_dirfsp */
                                smb_fname_dst);
 
        TALLOC_FREE(smb_fname_dst);