[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Thu Jul 1 17:46:02 UTC 2021


The branch, master has been updated
       via  0e3ddc27ed6 vfs_default: use fsp_get_io_fd() for copy_file_range()
      from  11a3a8d9b9c WHATSNEW: document new preopen:* options

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0e3ddc27ed6d603a21cb2b187f3295506d560604
Author: Ralph Boehme <slow at samba.org>
Date:   Thu Jul 1 15:19:56 2021 +0200

    vfs_default: use fsp_get_io_fd() for copy_file_range()
    
    Unintentionally used fsp_get_pathref_fd() in the initial patchset.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12033
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jul  1 17:45:49 UTC 2021 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_default.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 0681c396ca4..b96badc0de2 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -2279,9 +2279,9 @@ static NTSTATUS vfswrap_offload_copy_file_range(struct tevent_req *req)
 	}
 
 	while (state->remaining > 0) {
-		nwritten = copy_file_range(fsp_get_pathref_fd(state->src_fsp),
+		nwritten = copy_file_range(fsp_get_io_fd(state->src_fsp),
 					   &state->src_off,
-					   fsp_get_pathref_fd(state->dst_fsp),
+					   fsp_get_io_fd(state->dst_fsp),
 					   &state->dst_off,
 					   state->remaining,
 					   0);


-- 
Samba Shared Repository



More information about the samba-cvs mailing list