SMB3: Rename clone_range to copychunk_range
Server side copy is one of the most important mechanisms smb2/smb3 supports and it was unintentionally disabled for most use cases. Renaming calls to reflect the underlying smb2 ioctl called. This is similar to the name duplicate_extents used for a similar ioctl which is also used to duplicate files by reusing fs blocks. The name change is to avoid confusion. Signed-off-by: Sachin Prabhu <sprabhu@redhat.com> CC: Stable <stable@vger.kernel.org> Signed-off-by: Steve French <smfrench@gmail.com> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
このコミットが含まれているのは:
@@ -593,7 +593,7 @@ req_res_key_exit:
|
||||
}
|
||||
|
||||
static int
|
||||
smb2_clone_range(const unsigned int xid,
|
||||
smb2_copychunk_range(const unsigned int xid,
|
||||
struct cifsFileInfo *srcfile,
|
||||
struct cifsFileInfo *trgtfile, u64 src_off,
|
||||
u64 len, u64 dest_off)
|
||||
@@ -611,7 +611,7 @@ smb2_clone_range(const unsigned int xid,
|
||||
if (pcchunk == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
cifs_dbg(FYI, "in smb2_clone_range - about to call request res key\n");
|
||||
cifs_dbg(FYI, "in smb2_copychunk_range - about to call request res key\n");
|
||||
/* Request a key from the server to identify the source of the copy */
|
||||
rc = SMB2_request_res_key(xid, tlink_tcon(srcfile->tlink),
|
||||
srcfile->fid.persistent_fid,
|
||||
@@ -2378,7 +2378,7 @@ struct smb_version_operations smb20_operations = {
|
||||
.set_oplock_level = smb2_set_oplock_level,
|
||||
.create_lease_buf = smb2_create_lease_buf,
|
||||
.parse_lease_buf = smb2_parse_lease_buf,
|
||||
.clone_range = smb2_clone_range,
|
||||
.copychunk_range = smb2_copychunk_range,
|
||||
.wp_retry_size = smb2_wp_retry_size,
|
||||
.dir_needs_close = smb2_dir_needs_close,
|
||||
.get_dfs_refer = smb2_get_dfs_refer,
|
||||
@@ -2461,7 +2461,7 @@ struct smb_version_operations smb21_operations = {
|
||||
.set_oplock_level = smb21_set_oplock_level,
|
||||
.create_lease_buf = smb2_create_lease_buf,
|
||||
.parse_lease_buf = smb2_parse_lease_buf,
|
||||
.clone_range = smb2_clone_range,
|
||||
.copychunk_range = smb2_copychunk_range,
|
||||
.wp_retry_size = smb2_wp_retry_size,
|
||||
.dir_needs_close = smb2_dir_needs_close,
|
||||
.enum_snapshots = smb3_enum_snapshots,
|
||||
@@ -2548,7 +2548,7 @@ struct smb_version_operations smb30_operations = {
|
||||
.set_oplock_level = smb3_set_oplock_level,
|
||||
.create_lease_buf = smb3_create_lease_buf,
|
||||
.parse_lease_buf = smb3_parse_lease_buf,
|
||||
.clone_range = smb2_clone_range,
|
||||
.copychunk_range = smb2_copychunk_range,
|
||||
.duplicate_extents = smb2_duplicate_extents,
|
||||
.validate_negotiate = smb3_validate_negotiate,
|
||||
.wp_retry_size = smb2_wp_retry_size,
|
||||
@@ -2643,7 +2643,7 @@ struct smb_version_operations smb311_operations = {
|
||||
.set_oplock_level = smb3_set_oplock_level,
|
||||
.create_lease_buf = smb3_create_lease_buf,
|
||||
.parse_lease_buf = smb3_parse_lease_buf,
|
||||
.clone_range = smb2_clone_range,
|
||||
.copychunk_range = smb2_copychunk_range,
|
||||
.duplicate_extents = smb2_duplicate_extents,
|
||||
/* .validate_negotiate = smb3_validate_negotiate, */ /* not used in 3.11 */
|
||||
.wp_retry_size = smb2_wp_retry_size,
|
||||
|
新しいイシューから参照
ユーザーをブロックする