s3: smbd: Now we've proved dst_dirfsp parameter is always NULL, remove the parameter...

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 78e1b48be09bcca41c3c87da45ff39ff5af96920..1b54a86dc540ebbb5893fb05d6fa5d38ffefd310 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -973,7 +973,6 @@ ssize_t sendfile_short_send(struct smbXsrv_connection *xconn,
                            size_t smb_maxcnt);
 NTSTATUS rename_internals_fsp(connection_struct *conn,
                        files_struct *fsp,
-                       struct files_struct *dst_dirfsp,
                        struct smb_filename *smb_fname_dst_in,
                        const char *dst_original_lcomp,
                        uint32_t attrs,

diff --git a/source3/smbd/smb2_reply.c b/source3/smbd/smb2_reply.c
index aea5d627addea94ec9e1793d5e03b7ab5dd1a847..a8edaa19476b323882107a666e30b4a6b8ddb6eb 100644 (file)
--- a/source3/smbd/smb2_reply.c
+++ b/source3/smbd/smb2_reply.c
@@ -1386,7 +1386,6 @@ static NTSTATUS parent_dirname_compatible_open(connection_struct *conn,
 
 NTSTATUS rename_internals_fsp(connection_struct *conn,
                        files_struct *fsp,
-                       struct files_struct *dst_dirfsp,
                        struct smb_filename *smb_fname_dst_in,
                        const char *dst_original_lcomp,
                        uint32_t attrs,
@@ -1938,7 +1937,6 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
 
        status = rename_internals_fsp(conn,
                                        fsp,
-                                       NULL,
                                        smb_fname_dst,
                                        dst_original_lcomp,
                                        attrs,

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index 0f1ef2d43543367bb1259d0b786d2df5122ddb1e..ac7512c739fbc57349debbd5f701502b200ab6d1 100644 (file)
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -4382,7 +4382,6 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
                  smb_fname_str_dbg(smb_fname_dst)));
        status = rename_internals_fsp(conn,
                                fsp,
-                               NULL, /* dst_dirfsp */
                                smb_fname_dst,
                                dst_original_lcomp,
                                (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM),
@@ -4751,7 +4750,6 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
                          smb_fname_str_dbg(smb_fname_dst)));
                status = rename_internals_fsp(conn,
                                        fsp,
-                                       NULL,
                                        smb_fname_dst,
                                        dst_original_lcomp,
                                        0,