smb: move copychunk definitions to common/smb2pdu.h

Rename 3 places:

  - copychunk_ioctl -> copychunk_ioctl_req
  - copychunk -> srv_copychunk
  - server: ResumeKey -> SourceKeyU64

Merge the struct members of the server and the client, then move duplicate
definitions to common header file.

Co-developed-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: ZhangGuoDong <zhangguodong@kylinos.cn>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/cifspdu.h b/fs/smb/client/cifspdu.h
index d9cf7db0ac35e960078cfd5b342f72cce7629e42..c86a329e58221feeefc0e97a47d2d815840ab684 100644 (file)
--- a/fs/smb/client/cifspdu.h
+++ b/fs/smb/client/cifspdu.h
@@ -1323,14 +1323,6 @@ typedef struct smb_com_ntransact_rsp {
        /* parms and data follow */
 } __attribute__((packed)) NTRANSACT_RSP;
 
-/* See MS-SMB 2.2.7.2.1.1 */
-struct srv_copychunk {
-       __le64 SourceOffset;
-       __le64 DestinationOffset;
-       __le32 CopyLength;
-       __u32  Reserved;
-} __packed;
-
 typedef struct smb_com_transaction_ioctl_req {
        struct smb_hdr hdr;     /* wct = 23 */
        __u8 MaxSetupCount;

diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index 5103fe3c92f49dc93d1952a2fc930fc21b33b0d0..dd569cc5abcc694fd5542dfafb3dc0e1ceb2028f 100644 (file)
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -1524,7 +1524,7 @@ smb2_close_getattr(const unsigned int xid, struct cifs_tcon *tcon,
 static int
 SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon,
                     u64 persistent_fid, u64 volatile_fid,
-                    struct copychunk_ioctl *pcchunk)
+                    struct copychunk_ioctl_req *pcchunk)
 {
        int rc;
        unsigned int ret_data_len;
@@ -1857,10 +1857,10 @@ smb2_copychunk_range(const unsigned int xid,
 {
        int rc = 0;
        unsigned int ret_data_len = 0;
-       struct copychunk_ioctl *cc_req = NULL;
+       struct copychunk_ioctl_req *cc_req = NULL;
        struct copychunk_ioctl_rsp *cc_rsp = NULL;
        struct cifs_tcon *tcon;
-       struct copychunk *chunk;
+       struct srv_copychunk *chunk;
        u32 chunks, chunk_count, chunk_bytes;
        u32 copy_bytes, copy_bytes_left;
        u32 chunks_written, bytes_written;

diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h
index c9901723dfd816eed0ab7bf2bbdad97dde4b096d..de2d83c6463c998044f3108135d4bcb741acbc96 100644 (file)
--- a/fs/smb/client/smb2pdu.h
+++ b/fs/smb/client/smb2pdu.h
@@ -193,36 +193,12 @@ struct crt_sd_ctxt {
        struct smb3_sd sd;
 } __packed;
 
-
-#define COPY_CHUNK_RES_KEY_SIZE        24
 struct resume_key_req {
        char ResumeKey[COPY_CHUNK_RES_KEY_SIZE];
        __le32  ContextLength;  /* MBZ */
        char    Context[];      /* ignored, Windows sets to 4 bytes of zero */
 } __packed;
 
-
-struct copychunk {
-       __le64 SourceOffset;
-       __le64 TargetOffset;
-       __le32 Length;
-       __le32 Reserved;
-} __packed;
-
-/* this goes in the ioctl buffer when doing a copychunk request */
-struct copychunk_ioctl {
-       char SourceKey[COPY_CHUNK_RES_KEY_SIZE];
-       __le32 ChunkCount;
-       __le32 Reserved;
-       struct copychunk Chunks[];
-} __packed;
-
-struct copychunk_ioctl_rsp {
-       __le32 ChunksWritten;
-       __le32 ChunkBytesWritten;
-       __le32 TotalBytesWritten;
-} __packed;
-
 /* See MS-FSCC 2.3.29 and 2.3.30 */
 struct get_retrieval_pointer_count_req {
        __le64 StartingVcn; /* virtual cluster number (signed) */

diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h
index 4c254957200b8638f645cc9f93d9088278e401cb..1bd5835c56e45f958f0f17791e0037615816823f 100644 (file)
--- a/fs/smb/common/smb2pdu.h
+++ b/fs/smb/common/smb2pdu.h
@@ -1388,6 +1388,35 @@ struct smb2_ioctl_req {
        __u8   Buffer[];
 } __packed;
 
+/* See MS-SMB2 2.2.31.1.1 */
+struct srv_copychunk {
+       __le64 SourceOffset;
+       __le64 TargetOffset;
+       __le32 Length;
+       __le32 Reserved;
+} __packed;
+
+#define COPY_CHUNK_RES_KEY_SIZE        24
+
+/* See MS-SMB2 2.2.31.1 */
+/* this goes in the ioctl buffer when doing a copychunk request */
+struct copychunk_ioctl_req {
+       union {
+               char SourceKey[COPY_CHUNK_RES_KEY_SIZE];
+               __le64 SourceKeyU64[3];
+       };
+       __le32 ChunkCount;
+       __le32 Reserved;
+       struct srv_copychunk Chunks[] __counted_by_le(ChunkCount);
+} __packed;
+
+/* See MS-SMB2 2.2.32.1 */
+struct copychunk_ioctl_rsp {
+       __le32 ChunksWritten;
+       __le32 ChunkBytesWritten;
+       __le32 TotalBytesWritten;
+} __packed;
+
 struct smb2_ioctl_rsp {
        struct smb2_hdr hdr;
        __le16 StructureSize; /* Must be 49 */

diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index c5426f57cadf0b71d784fee0cc8eb70e9e92fba2..33f89dca19201daa11f1b8c37ee9b413d2e65dea 100644 (file)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -7754,11 +7754,11 @@ static int fsctl_copychunk(struct ksmbd_work *work,
        }
 
        src_fp = ksmbd_lookup_foreign_fd(work,
-                                        le64_to_cpu(ci_req->ResumeKey[0]));
+                                        le64_to_cpu(ci_req->SourceKeyU64[0]));
        dst_fp = ksmbd_lookup_fd_slow(work, volatile_id, persistent_id);
        ret = -EINVAL;
        if (!src_fp ||
-           src_fp->persistent_id != le64_to_cpu(ci_req->ResumeKey[1])) {
+           src_fp->persistent_id != le64_to_cpu(ci_req->SourceKeyU64[1])) {
                rsp->hdr.Status = STATUS_OBJECT_NAME_NOT_FOUND;
                goto out;
        }

diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h
index ac22072997351d75648e3856c09afe1f15b07c85..284d6771060e9c4489b130c1f73ab81f64466dff 100644 (file)
--- a/fs/smb/server/smb2pdu.h
+++ b/fs/smb/server/smb2pdu.h
@@ -174,26 +174,6 @@ struct resume_key_ioctl_rsp {
        __u8 Context[4]; /* ignored, Windows sets to 4 bytes of zero */
 } __packed;
 
-struct srv_copychunk {
-       __le64 SourceOffset;
-       __le64 TargetOffset;
-       __le32 Length;
-       __le32 Reserved;
-} __packed;
-
-struct copychunk_ioctl_req {
-       __le64 ResumeKey[3];
-       __le32 ChunkCount;
-       __le32 Reserved;
-       struct srv_copychunk Chunks[] __counted_by_le(ChunkCount);
-} __packed;
-
-struct copychunk_ioctl_rsp {
-       __le32 ChunksWritten;
-       __le32 ChunkBytesWritten;
-       __le32 TotalBytesWritten;
-} __packed;
-
 struct file_sparse {
        __u8    SetSparse;
 } __packed;