Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Force use of GFP_NOFS in ocfs2_write()
  ocfs2: fix sparse warnings in fs/ocfs2/cluster
  ocfs2: fix sparse warnings in fs/ocfs2/dlm
  ocfs2: fix sparse warnings in fs/ocfs2
  [PATCH] Copy i_flags to ocfs2 inode flags on write
  [PATCH] ocfs2: use __set_current_state()
  ocfs2: Wrap access of directory allocations with ip_alloc_sem.
  [PATCH] fs/ocfs2/: make 3 functions static
  ocfs2: Implement compat_ioctl()

2 files changed, 6 insertions, 6 deletions

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index eba282da500e..979113479c66 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -438,7 +438,7 @@ static inline void o2hb_prepare_block(struct o2hb_region *reg,
                                                                    hb_block));
 
         mlog(ML_HB_BIO, "our node generation = 0x%llx, cksum = 0x%x\n",
-             (long long)cpu_to_le64(generation),
+             (long long)generation,
              le32_to_cpu(hb_block->hb_cksum));
 }
 
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 69caf3e12fea..0b229a9c7952 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -1496,7 +1496,7 @@ static void o2net_start_connect(struct work_struct *work)
         sock->sk->sk_allocation = GFP_ATOMIC;
 
         myaddr.sin_family = AF_INET;
-        myaddr.sin_addr.s_addr = (__force u32)mynode->nd_ipv4_address;
+        myaddr.sin_addr.s_addr = mynode->nd_ipv4_address;
         myaddr.sin_port = (__force u16)htons(0); /* any port */
 
         ret = sock->ops->bind(sock, (struct sockaddr *)&myaddr,
@@ -1521,8 +1521,8 @@ static void o2net_start_connect(struct work_struct *work)
         spin_unlock(&nn->nn_lock);
 
         remoteaddr.sin_family = AF_INET;
-        remoteaddr.sin_addr.s_addr = (__force u32)node->nd_ipv4_address;
-        remoteaddr.sin_port = (__force u16)node->nd_ipv4_port;
+        remoteaddr.sin_addr.s_addr = node->nd_ipv4_address;
+        remoteaddr.sin_port = node->nd_ipv4_port;
 
         ret = sc->sc_sock->ops->connect(sc->sc_sock,
                                         (struct sockaddr *)&remoteaddr,
@@ -1810,8 +1810,8 @@ static int o2net_open_listening_sock(__be32 addr, __be16 port)
         int ret;
         struct sockaddr_in sin = {
                 .sin_family = PF_INET,
-                .sin_addr = { .s_addr = (__force u32)addr },
-                .sin_port = (__force u16)port,
+                .sin_addr = { .s_addr = addr },
+                .sin_port = port,
         };
 
         ret = sock_create(PF_INET, SOCK_STREAM, IPPROTO_TCP, &sock);