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: (32 commits)
  [PATCH] ocfs2: zero_user_page conversion
  ocfs2: Support xfs style space reservation ioctls
  ocfs2: support for removing file regions
  ocfs2: update truncate handling of partial clusters
  ocfs2: btree support for removal of arbirtrary extents
  ocfs2: Support creation of unwritten extents
  ocfs2: support writing of unwritten extents
  ocfs2: small cleanup of ocfs2_write_begin_nolock()
  ocfs2: btree changes for unwritten extents
  ocfs2: abstract btree growing calls
  ocfs2: use all extent block suballocators
  ocfs2: plug truncate into cached dealloc routines
  ocfs2: simplify deallocation locking
  ocfs2: harden buffer check during mapping of page blocks
  ocfs2: shared writeable mmap
  ocfs2: factor out write aops into nolock variants
  ocfs2: rework ocfs2_buffered_write_cluster()
  ocfs2: take ip_alloc_sem during entire truncate
  ocfs2: Add "preferred slot" mount option
  [KJ PATCH] Replacing memset(<addr>,0,PAGE_SIZE) with clear_page() in fs/ocfs2/dlm/dlmrecovery.c
  ...

1 files changed, 8 insertions, 13 deletions

diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 0b229a9c7952..f0bdfd944c44 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -261,14 +261,12 @@ out:
 
 static void o2net_complete_nodes_nsw(struct o2net_node *nn)
 {
-        struct list_head *iter, *tmp;
+        struct o2net_status_wait *nsw, *tmp;
         unsigned int num_kills = 0;
-        struct o2net_status_wait *nsw;
 
         assert_spin_locked(&nn->nn_lock);
 
-        list_for_each_safe(iter, tmp, &nn->nn_status_list) {
-                nsw = list_entry(iter, struct o2net_status_wait, ns_node_item);
+        list_for_each_entry_safe(nsw, tmp, &nn->nn_status_list, ns_node_item) {
                 o2net_complete_nsw_locked(nn, nsw, O2NET_ERR_DIED, 0);
                 num_kills++;
         }
@@ -764,13 +762,10 @@ EXPORT_SYMBOL_GPL(o2net_register_handler);
 
 void o2net_unregister_handler_list(struct list_head *list)
 {
-        struct list_head *pos, *n;
-        struct o2net_msg_handler *nmh;
+        struct o2net_msg_handler *nmh, *n;
 
         write_lock(&o2net_handler_lock);
-        list_for_each_safe(pos, n, list) {
-                nmh = list_entry(pos, struct o2net_msg_handler,
-                                 nh_unregister_item);
+        list_for_each_entry_safe(nmh, n, list, nh_unregister_item) {
                 mlog(ML_TCP, "unregistering handler func %p type %u key %08x\n",
                      nmh->nh_func, nmh->nh_msg_type, nmh->nh_key);
                 rb_erase(&nmh->nh_node, &o2net_handler_tree);
@@ -1638,8 +1633,8 @@ static void o2net_hb_node_up_cb(struct o2nm_node *node, int node_num,
 
 void o2net_unregister_hb_callbacks(void)
 {
-        o2hb_unregister_callback(&o2net_hb_up);
-        o2hb_unregister_callback(&o2net_hb_down);
+        o2hb_unregister_callback(NULL, &o2net_hb_up);
+        o2hb_unregister_callback(NULL, &o2net_hb_down);
 }
 
 int o2net_register_hb_callbacks(void)
@@ -1651,9 +1646,9 @@ int o2net_register_hb_callbacks(void)
         o2hb_setup_callback(&o2net_hb_up, O2HB_NODE_UP_CB,
                             o2net_hb_node_up_cb, NULL, O2NET_HB_PRI);
 
-        ret = o2hb_register_callback(&o2net_hb_up);
+        ret = o2hb_register_callback(NULL, &o2net_hb_up);
         if (ret == 0)
-                ret = o2hb_register_callback(&o2net_hb_down);
+                ret = o2hb_register_callback(NULL, &o2net_hb_down);
 
         if (ret)
                 o2net_unregister_hb_callbacks();