Kaynağa Gözat

ocfs2: trivial endianness misannotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 13 yıl önce
ebeveyn
işleme
8515841086
3 değiştirilmiş dosya ile 5 ekleme ve 5 silme
  1. 1 1
      fs/ocfs2/dlm/dlmast.c
  2. 3 3
      fs/ocfs2/dlm/dlmcommon.h
  3. 1 1
      fs/ocfs2/dlm/dlmdomain.c

+ 1 - 1
fs/ocfs2/dlm/dlmast.c

@@ -293,7 +293,7 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data,
 	struct dlm_proxy_ast *past = (struct dlm_proxy_ast *) msg->buf;
 	char *name;
 	struct list_head *iter, *head=NULL;
-	u64 cookie;
+	__be64 cookie;
 	u32 flags;
 	u8 node;
 

+ 3 - 3
fs/ocfs2/dlm/dlmcommon.h

@@ -679,7 +679,7 @@ struct dlm_query_join_packet {
 };
 
 union dlm_query_join_response {
-	u32 intval;
+	__be32 intval;
 	struct dlm_query_join_packet packet;
 };
 
@@ -755,8 +755,8 @@ struct dlm_query_region {
 struct dlm_node_info {
 	u8 ni_nodenum;
 	u8 pad1;
-	u16 ni_ipv4_port;
-	u32 ni_ipv4_address;
+	__be16 ni_ipv4_port;
+	__be32 ni_ipv4_address;
 };
 
 struct dlm_query_nodeinfo {

+ 1 - 1
fs/ocfs2/dlm/dlmdomain.c

@@ -818,7 +818,7 @@ static void dlm_query_join_packet_to_wire(struct dlm_query_join_packet *packet,
 	union dlm_query_join_response response;
 
 	response.packet = *packet;
-	*wire = cpu_to_be32(response.intval);
+	*wire = be32_to_cpu(response.intval);
 }
 
 static void dlm_query_join_wire_to_packet(u32 wire,