smb: move create_durable_rsp_v2 to common/smb2pdu.h

Modify the following places:

  - some fields in "struct create_durable_v2_rsp" ->
                       struct durable_context_v2_rsp
  - durable_reconnect_context_v2_rsp -> durable_context_v2_rsp
  - create_durable_v2_rsp -> create_durable_rsp_v2

Then move them to common header file.

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

diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h
index 741ceabc3bbad4beaa26f7da9f92cfbc0582dca3..32da7a4773e16092541e9cbdfa19d100fbcb3147 100644 (file)
--- a/fs/smb/client/smb2pdu.h
+++ b/fs/smb/client/smb2pdu.h
@@ -138,12 +138,6 @@ struct share_redirect_error_context_rsp {
 /* Flags */
 #define SMB2_DHANDLE_FLAG_PERSISTENT   0x00000002
 
-/* See MS-SMB2 2.2.14.2.12 */
-struct durable_reconnect_context_v2_rsp {
-       __le32 Timeout;
-       __le32 Flags; /* see above DHANDLE_FLAG_PERSISTENT */
-} __packed;
-
 /* See MS-SMB2 2.2.13.2.5 */
 struct crt_twarp_ctxt {
        struct create_context_hdr ccontext;

diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h
index 77b1b8eb9c0ee4c6cb7d17d19efbfa534fea5739..4ea515732b3802d051e5dc511cbfd950c4c038b9 100644 (file)
--- a/fs/smb/common/smb2pdu.h
+++ b/fs/smb/common/smb2pdu.h
@@ -1320,6 +1320,18 @@ struct create_durable_handle_reconnect_v2 {
        struct durable_reconnect_context_v2 dcontext;
 } __packed;
 
+/* See MS-SMB2 2.2.14.2.12 */
+struct durable_context_v2_rsp {
+       __le32 Timeout;
+       __le32 Flags; /* see SMB2_DHANDLE_FLAG_PERSISTENT */
+} __packed;
+
+struct create_durable_rsp_v2 {
+       struct create_context_hdr ccontext;
+       __u8   Name[8];
+       struct durable_context_v2_rsp dcontext;
+} __packed;
+
 /* See MS-SMB2 2.2.14.2.5 */
 struct create_mxac_rsp {
        struct create_context_hdr ccontext;

diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c
index a04d5702820d07e6db220e71f28cd1b1c25494f9..1f07ebf431d7b02e0a01aeb329146ff74d2e19ec 100644 (file)
--- a/fs/smb/server/oplock.c
+++ b/fs/smb/server/oplock.c
@@ -1617,9 +1617,9 @@ void create_durable_rsp_buf(char *cc)
  */
 void create_durable_v2_rsp_buf(char *cc, struct ksmbd_file *fp)
 {
-       struct create_durable_v2_rsp *buf;
+       struct create_durable_rsp_v2 *buf;
 
-       buf = (struct create_durable_v2_rsp *)cc;
+       buf = (struct create_durable_rsp_v2 *)cc;
        memset(buf, 0, sizeof(struct create_durable_rsp));
        buf->ccontext.DataOffset = cpu_to_le16(offsetof
                        (struct create_durable_rsp, Data));
@@ -1633,9 +1633,9 @@ void create_durable_v2_rsp_buf(char *cc, struct ksmbd_file *fp)
        buf->Name[2] = '2';
        buf->Name[3] = 'Q';
 
-       buf->Timeout = cpu_to_le32(fp->durable_timeout);
+       buf->dcontext.Timeout = cpu_to_le32(fp->durable_timeout);
        if (fp->is_persistent)
-               buf->Flags = cpu_to_le32(SMB2_DHANDLE_FLAG_PERSISTENT);
+               buf->dcontext.Flags = cpu_to_le32(SMB2_DHANDLE_FLAG_PERSISTENT);
 }
 
 /**

diff --git a/fs/smb/server/smb2ops.c b/fs/smb/server/smb2ops.c
index bcf05caa2304d9e71670e514397d45e217e7bbb0..edd7eca0714adce0fdf09e480b882608cbe17c22 100644 (file)
--- a/fs/smb/server/smb2ops.c
+++ b/fs/smb/server/smb2ops.c
@@ -59,7 +59,7 @@ static struct smb_version_values smb30_server_values = {
        .cap_large_files = SMB2_LARGE_FILES,
        .create_lease_size = sizeof(struct create_lease_v2),
        .create_durable_size = sizeof(struct create_durable_rsp),
-       .create_durable_v2_size = sizeof(struct create_durable_v2_rsp),
+       .create_durable_v2_size = sizeof(struct create_durable_rsp_v2),
        .create_mxac_size = sizeof(struct create_mxac_rsp),
        .create_disk_id_size = sizeof(struct create_disk_id_rsp),
        .create_posix_size = sizeof(struct create_posix_rsp),
@@ -86,7 +86,7 @@ static struct smb_version_values smb302_server_values = {
        .cap_large_files = SMB2_LARGE_FILES,
        .create_lease_size = sizeof(struct create_lease_v2),
        .create_durable_size = sizeof(struct create_durable_rsp),
-       .create_durable_v2_size = sizeof(struct create_durable_v2_rsp),
+       .create_durable_v2_size = sizeof(struct create_durable_rsp_v2),
        .create_mxac_size = sizeof(struct create_mxac_rsp),
        .create_disk_id_size = sizeof(struct create_disk_id_rsp),
        .create_posix_size = sizeof(struct create_posix_rsp),
@@ -113,7 +113,7 @@ static struct smb_version_values smb311_server_values = {
        .cap_large_files = SMB2_LARGE_FILES,
        .create_lease_size = sizeof(struct create_lease_v2),
        .create_durable_size = sizeof(struct create_durable_rsp),
-       .create_durable_v2_size = sizeof(struct create_durable_v2_rsp),
+       .create_durable_v2_size = sizeof(struct create_durable_rsp_v2),
        .create_mxac_size = sizeof(struct create_mxac_rsp),
        .create_disk_id_size = sizeof(struct create_disk_id_rsp),
        .create_posix_size = sizeof(struct create_posix_rsp),

diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h
index d4026d313d675554650531d6d12538aadc9160c4..46e14bd4f2da83d895dd27f4ef37fd3f42d167a3 100644 (file)
--- a/fs/smb/server/smb2pdu.h
+++ b/fs/smb/server/smb2pdu.h
@@ -98,12 +98,6 @@ struct create_durable_rsp {
 /* See MS-SMB2 2.2.13.2.11 */
 /* Flags */
 #define SMB2_DHANDLE_FLAG_PERSISTENT   0x00000002
-struct create_durable_v2_rsp {
-       struct create_context_hdr ccontext;
-       __u8   Name[8];
-       __le32 Timeout;
-       __le32 Flags;
-} __packed;
 
 /* equivalent of the contents of SMB3.1.1 POSIX open context response */
 struct create_posix_rsp {