smb: move smb_sockaddr_in and smb_sockaddr_in6 to common/smb2pdu.h

Rename 4 places:

  - iface_info_ipv4 -> smb_sockaddr_in
  - iface_info_ipv6 -> smb_sockaddr_in6
  - IPv4address -> IPv4Address
  - IPv6address -> IPv6Address

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/smb2ops.c b/fs/smb/client/smb2ops.c
index 1e39f2165e427230b595b8b289d98d6d858e3e18..5103fe3c92f49dc93d1952a2fc930fc21b33b0d0 100644 (file)
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -624,8 +624,8 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,
        struct network_interface_info_ioctl_rsp *p;
        struct sockaddr_in *addr4;
        struct sockaddr_in6 *addr6;
-       struct iface_info_ipv4 *p4;
-       struct iface_info_ipv6 *p6;
+       struct smb_sockaddr_in *p4;
+       struct smb_sockaddr_in6 *p6;
        struct cifs_server_iface *info = NULL, *iface = NULL, *niface = NULL;
        struct cifs_server_iface tmp_iface;
        ssize_t bytes_left;
@@ -685,7 +685,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,
                 */
                case INTERNETWORK:
                        addr4 = (struct sockaddr_in *)&tmp_iface.sockaddr;
-                       p4 = (struct iface_info_ipv4 *)p->Buffer;
+                       p4 = (struct smb_sockaddr_in *)p->Buffer;
                        addr4->sin_family = AF_INET;
                        memcpy(&addr4->sin_addr, &p4->IPv4Address, 4);
 
@@ -697,7 +697,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,
                        break;
                case INTERNETWORKV6:
                        addr6 = (struct sockaddr_in6 *)&tmp_iface.sockaddr;
-                       p6 = (struct iface_info_ipv6 *)p->Buffer;
+                       p6 = (struct smb_sockaddr_in6 *)p->Buffer;
                        addr6->sin6_family = AF_INET6;
                        memcpy(&addr6->sin6_addr, &p6->IPv6Address, 16);
 

diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h
index 101024f8f725687ac0e6aa2efd5017daccc1d165..c9901723dfd816eed0ab7bf2bbdad97dde4b096d 100644 (file)
--- a/fs/smb/client/smb2pdu.h
+++ b/fs/smb/client/smb2pdu.h
@@ -279,19 +279,6 @@ struct network_interface_info_ioctl_rsp {
        __u8 Buffer[126];
 } __packed;
 
-struct iface_info_ipv4 {
-       __be16 Port;
-       __be32 IPv4Address;
-       __be64 Reserved;
-} __packed;
-
-struct iface_info_ipv6 {
-       __be16 Port;
-       __be32 FlowInfo;
-       __u8   IPv6Address[16];
-       __be32 ScopeId;
-} __packed;
-
 #define NO_FILE_ID 0xFFFFFFFFFFFFFFFFULL /* general ioctls to srv not to file */
 
 struct compress_ioctl {

diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h
index f79a5165a7cc6a22b4aecedca75ecf6e86751aaf..4c254957200b8638f645cc9f93d9088278e401cb 100644 (file)
--- a/fs/smb/common/smb2pdu.h
+++ b/fs/smb/common/smb2pdu.h
@@ -1404,6 +1404,21 @@ struct smb2_ioctl_rsp {
        __u8   Buffer[];
 } __packed;
 
+/* See MS-SMB2 2.2.32.5.1.1 */
+struct smb_sockaddr_in {
+       __be16 Port;
+       __be32 IPv4Address;
+       __u8   Reserved[8];
+} __packed;
+
+/* See MS-SMB2 2.2.32.5.1.2 */
+struct smb_sockaddr_in6 {
+       __be16 Port;
+       __be32 FlowInfo;
+       __u8   IPv6Address[16];
+       __be32 ScopeId;
+} __packed;
+
 /* this goes in the ioctl buffer when doing FSCTL_SET_ZERO_DATA */
 struct file_zero_data_information {
        __le64  FileOffset;

diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index d52528792e46486ff80a92518bd5acffbe4478dd..c5426f57cadf0b71d784fee0cc8eb70e9e92fba2 100644 (file)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -7900,7 +7900,7 @@ ipv6_retry:
                        idev = __in_dev_get_rtnl(netdev);
                        if (!idev)
                                continue;
-                       sockaddr_storage->addr4.IPv4address =
+                       sockaddr_storage->addr4.IPv4Address =
                                                idev_ipv4_address(idev);
                        nbytes += sizeof(struct network_interface_info_ioctl_rsp);
                        ipv4_set = true;
@@ -7908,7 +7908,7 @@ ipv6_retry:
                } else {
                        struct inet6_dev *idev6;
                        struct inet6_ifaddr *ifa;
-                       __u8 *ipv6_addr = sockaddr_storage->addr6.IPv6address;
+                       __u8 *ipv6_addr = sockaddr_storage->addr6.IPv6Address;
 
                        sockaddr_storage->Family = cpu_to_le16(INTERNETWORKV6);
                        sockaddr_storage->addr6.Port = 0;

diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h
index 5163d5241b90d5661d415980c693ff06af6ee375..ac22072997351d75648e3856c09afe1f15b07c85 100644 (file)
--- a/fs/smb/server/smb2pdu.h
+++ b/fs/smb/server/smb2pdu.h
@@ -138,19 +138,6 @@ struct create_posix_rsp {
 
 #define SMB2_0_IOCTL_IS_FSCTL 0x00000001
 
-struct smb_sockaddr_in {
-       __be16 Port;
-       __be32 IPv4address;
-       __u8 Reserved[8];
-} __packed;
-
-struct smb_sockaddr_in6 {
-       __be16 Port;
-       __be32 FlowInfo;
-       __u8 IPv6address[16];
-       __be32 ScopeId;
-} __packed;
-
 #define INTERNETWORK   0x0002
 #define INTERNETWORKV6 0x0017