Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5fdf1e677127cb460c38733b9586b772d657be43

Authored by Mark Fasheh
1 parent a7d25539fd
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ocfs2: fix sparse warnings in fs/ocfs2/cluster 

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

fs/ocfs2/cluster/heartbeat.c
Diff comments   View file @ 5fdf1e6
... ... @@ -438,7 +438,7 @@
438 438 hb_block));
439 439  
440 440 mlog(ML_HB_BIO, "our node generation = 0x%llx, cksum = 0x%x\n",
441   - (long long)cpu_to_le64(generation),
  441 + (long long)generation,
442 442 le32_to_cpu(hb_block->hb_cksum));
443 443 }
444 444  
fs/ocfs2/cluster/tcp.c
Diff comments   View file @ 5fdf1e6
... ... @@ -1496,7 +1496,7 @@
1496 1496 sock->sk->sk_allocation = GFP_ATOMIC;
1497 1497  
1498 1498 myaddr.sin_family = AF_INET;
1499   - myaddr.sin_addr.s_addr = (__force u32)mynode->nd_ipv4_address;
  1499 + myaddr.sin_addr.s_addr = mynode->nd_ipv4_address;
1500 1500 myaddr.sin_port = (__force u16)htons(0); /* any port */
1501 1501  
1502 1502 ret = sock->ops->bind(sock, (struct sockaddr *)&myaddr,
... ... @@ -1521,8 +1521,8 @@
1521 1521 spin_unlock(&nn->nn_lock);
1522 1522  
1523 1523 remoteaddr.sin_family = AF_INET;
1524   - remoteaddr.sin_addr.s_addr = (__force u32)node->nd_ipv4_address;
1525   - remoteaddr.sin_port = (__force u16)node->nd_ipv4_port;
  1524 + remoteaddr.sin_addr.s_addr = node->nd_ipv4_address;
  1525 + remoteaddr.sin_port = node->nd_ipv4_port;
1526 1526  
1527 1527 ret = sc->sc_sock->ops->connect(sc->sc_sock,
1528 1528 (struct sockaddr *)&remoteaddr,
... ... @@ -1810,8 +1810,8 @@
1810 1810 int ret;
1811 1811 struct sockaddr_in sin = {
1812 1812 .sin_family = PF_INET,
1813   - .sin_addr = { .s_addr = (__force u32)addr },
1814   - .sin_port = (__force u16)port,
  1813 + .sin_addr = { .s_addr = addr },
  1814 + .sin_port = port,
1815 1815 };
1816 1816  
1817 1817 ret = sock_create(PF_INET, SOCK_STREAM, IPPROTO_TCP, &sock);