15 files changed, 169 insertions, 179 deletions

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 4a231a166cf8..1ef547e49373 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -1481,8 +1481,16 @@ static int ocfs2_write_begin_inline(struct address_space *mapping,
         handle_t *handle;
         struct ocfs2_dinode *di = (struct ocfs2_dinode *)wc->w_di_bh->b_data;
 
+        handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
+        if (IS_ERR(handle)) {
+                ret = PTR_ERR(handle);
+                mlog_errno(ret);
+                goto out;
+        }
+
         page = find_or_create_page(mapping, 0, GFP_NOFS);
         if (!page) {
+                ocfs2_commit_trans(osb, handle);
                 ret = -ENOMEM;
                 mlog_errno(ret);
                 goto out;
@@ -1494,13 +1502,6 @@ static int ocfs2_write_begin_inline(struct address_space *mapping,
         wc->w_pages[0] = wc->w_target_page = page;
         wc->w_num_pages = 1;
 
-        handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
-        if (IS_ERR(handle)) {
-                ret = PTR_ERR(handle);
-                mlog_errno(ret);
-                goto out;
-        }
-
         ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), wc->w_di_bh,
                                       OCFS2_JOURNAL_ACCESS_WRITE);
         if (ret) {
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 73039295d0d1..d13385448168 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -2572,6 +2572,25 @@ int o2hb_check_node_heartbeating(u8 node_num)
 }
 EXPORT_SYMBOL_GPL(o2hb_check_node_heartbeating);
 
+int o2hb_check_node_heartbeating_no_sem(u8 node_num)
+{
+        unsigned long testing_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
+        unsigned long flags;
+
+        spin_lock_irqsave(&o2hb_live_lock, flags);
+        o2hb_fill_node_map_from_callback(testing_map, sizeof(testing_map));
+        spin_unlock_irqrestore(&o2hb_live_lock, flags);
+        if (!test_bit(node_num, testing_map)) {
+                mlog(ML_HEARTBEAT,
+                     "node (%u) does not have heartbeating enabled.\n",
+                     node_num);
+                return 0;
+        }
+
+        return 1;
+}
+EXPORT_SYMBOL_GPL(o2hb_check_node_heartbeating_no_sem);
+
 int o2hb_check_node_heartbeating_from_callback(u8 node_num)
 {
         unsigned long testing_map[BITS_TO_LONGS(O2NM_MAX_NODES)];
diff --git a/fs/ocfs2/cluster/heartbeat.h b/fs/ocfs2/cluster/heartbeat.h
index 00ad8e8fea51..3ef5137dc362 100644
--- a/fs/ocfs2/cluster/heartbeat.h
+++ b/fs/ocfs2/cluster/heartbeat.h
@@ -80,6 +80,7 @@ void o2hb_fill_node_map(unsigned long *map,
 void o2hb_exit(void);
 int o2hb_init(void);
 int o2hb_check_node_heartbeating(u8 node_num);
+int o2hb_check_node_heartbeating_no_sem(u8 node_num);
 int o2hb_check_node_heartbeating_from_callback(u8 node_num);
 int o2hb_check_local_node_heartbeating(void);
 void o2hb_stop_all_regions(void);
diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c
index 73ba81928bce..27d1242c8383 100644
--- a/fs/ocfs2/cluster/netdebug.c
+++ b/fs/ocfs2/cluster/netdebug.c
@@ -185,29 +185,13 @@ static const struct seq_operations nst_seq_ops = {
 static int nst_fop_open(struct inode *inode, struct file *file)
 {
         struct o2net_send_tracking *dummy_nst;
-        struct seq_file *seq;
-        int ret;
 
-        dummy_nst = kmalloc(sizeof(struct o2net_send_tracking), GFP_KERNEL);
-        if (dummy_nst == NULL) {
-                ret = -ENOMEM;
-                goto out;
-        }
-        dummy_nst->st_task = NULL;
-
-        ret = seq_open(file, &nst_seq_ops);
-        if (ret)
-                goto out;
-
-        seq = file->private_data;
-        seq->private = dummy_nst;
+        dummy_nst = __seq_open_private(file, &nst_seq_ops, sizeof(*dummy_nst));
+        if (!dummy_nst)
+                return -ENOMEM;
         o2net_debug_add_nst(dummy_nst);
 
-        dummy_nst = NULL;
-
-out:
-        kfree(dummy_nst);
-        return ret;
+        return 0;
 }
 
 static int nst_fop_release(struct inode *inode, struct file *file)
@@ -412,33 +396,27 @@ static const struct seq_operations sc_seq_ops = {
         .show = sc_seq_show,
 };
 
-static int sc_common_open(struct file *file, struct o2net_sock_debug *sd)
+static int sc_common_open(struct file *file, int ctxt)
 {
+        struct o2net_sock_debug *sd;
         struct o2net_sock_container *dummy_sc;
-        struct seq_file *seq;
-        int ret;
 
-        dummy_sc = kmalloc(sizeof(struct o2net_sock_container), GFP_KERNEL);
-        if (dummy_sc == NULL) {
-                ret = -ENOMEM;
-                goto out;
-        }
-        dummy_sc->sc_page = NULL;
+        dummy_sc = kzalloc(sizeof(*dummy_sc), GFP_KERNEL);
+        if (!dummy_sc)
+                return -ENOMEM;
 
-        ret = seq_open(file, &sc_seq_ops);
-        if (ret)
-                goto out;
+        sd = __seq_open_private(file, &sc_seq_ops, sizeof(*sd));
+        if (!sd) {
+                kfree(dummy_sc);
+                return -ENOMEM;
+        }
 
-        seq = file->private_data;
-        seq->private = sd;
+        sd->dbg_ctxt = ctxt;
         sd->dbg_sock = dummy_sc;
-        o2net_debug_add_sc(dummy_sc);
 
-        dummy_sc = NULL;
+        o2net_debug_add_sc(dummy_sc);
 
-out:
-        kfree(dummy_sc);
-        return ret;
+        return 0;
 }
 
 static int sc_fop_release(struct inode *inode, struct file *file)
@@ -453,16 +431,7 @@ static int sc_fop_release(struct inode *inode, struct file *file)
 
 static int stats_fop_open(struct inode *inode, struct file *file)
 {
-        struct o2net_sock_debug *sd;
-
-        sd = kmalloc(sizeof(struct o2net_sock_debug), GFP_KERNEL);
-        if (sd == NULL)
-                return -ENOMEM;
-
-        sd->dbg_ctxt = SHOW_SOCK_STATS;
-        sd->dbg_sock = NULL;
-
-        return sc_common_open(file, sd);
+        return sc_common_open(file, SHOW_SOCK_STATS);
 }
 
 static const struct file_operations stats_seq_fops = {
@@ -474,16 +443,7 @@ static const struct file_operations stats_seq_fops = {
 
 static int sc_fop_open(struct inode *inode, struct file *file)
 {
-        struct o2net_sock_debug *sd;
-
-        sd = kmalloc(sizeof(struct o2net_sock_debug), GFP_KERNEL);
-        if (sd == NULL)
-                return -ENOMEM;
-
-        sd->dbg_ctxt = SHOW_SOCK_CONTAINERS;
-        sd->dbg_sock = NULL;
-
-        return sc_common_open(file, sd);
+        return sc_common_open(file, SHOW_SOCK_CONTAINERS);
 }
 
 static const struct file_operations sc_seq_fops = {
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index ea34952f9496..97de0fbd9f78 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -536,7 +536,7 @@ static void o2net_set_nn_state(struct o2net_node *nn,
         if (nn->nn_persistent_error || nn->nn_sc_valid)
                 wake_up(&nn->nn_sc_wq);
 
-        if (!was_err && nn->nn_persistent_error) {
+        if (was_valid && !was_err && nn->nn_persistent_error) {
                 o2quo_conn_err(o2net_num_from_nn(nn));
                 queue_delayed_work(o2net_wq, &nn->nn_still_up,
                                    msecs_to_jiffies(O2NET_QUORUM_DELAY_MS));
@@ -1601,7 +1601,15 @@ static void o2net_start_connect(struct work_struct *work)
         struct sockaddr_in myaddr = {0, }, remoteaddr = {0, };
         int ret = 0, stop;
         unsigned int timeout;
+        unsigned int noio_flag;
 
+        /*
+         * sock_create allocates the sock with GFP_KERNEL. We must set
+         * per-process flag PF_MEMALLOC_NOIO so that all allocations done
+         * by this process are done as if GFP_NOIO was specified. So we
+         * are not reentering filesystem while doing memory reclaim.
+         */
+        noio_flag = memalloc_noio_save();
         /* if we're greater we initiate tx, otherwise we accept */
         if (o2nm_this_node() <= o2net_num_from_nn(nn))
                 goto out;
@@ -1710,6 +1718,7 @@ out:
         if (mynode)
                 o2nm_node_put(mynode);
 
+        memalloc_noio_restore(noio_flag);
         return;
 }
 
@@ -1721,7 +1730,8 @@ static void o2net_connect_expired(struct work_struct *work)
         spin_lock(&nn->nn_lock);
         if (!nn->nn_sc_valid) {
                 printk(KERN_NOTICE "o2net: No connection established with "
-                       "node %u after %u.%u seconds, giving up.\n",
+                       "node %u after %u.%u seconds, check network and"
+                       " cluster configuration.\n",
                      o2net_num_from_nn(nn),
                      o2net_idle_timeout() / 1000,
                      o2net_idle_timeout() % 1000);
@@ -1835,6 +1845,15 @@ static int o2net_accept_one(struct socket *sock, int *more)
         struct o2nm_node *local_node = NULL;
         struct o2net_sock_container *sc = NULL;
         struct o2net_node *nn;
+        unsigned int noio_flag;
+
+        /*
+         * sock_create_lite allocates the sock with GFP_KERNEL. We must set
+         * per-process flag PF_MEMALLOC_NOIO so that all allocations done
+         * by this process are done as if GFP_NOIO was specified. So we
+         * are not reentering filesystem while doing memory reclaim.
+         */
+        noio_flag = memalloc_noio_save();
 
         BUG_ON(sock == NULL);
         *more = 0;
@@ -1951,6 +1970,8 @@ out:
                 o2nm_node_put(local_node);
         if (sc)
                 sc_put(sc);
+
+        memalloc_noio_restore(noio_flag);
         return ret;
 }
 
@@ -2146,17 +2167,13 @@ int o2net_init(void)
         o2quo_init();
 
         if (o2net_debugfs_init())
-                return -ENOMEM;
+                goto out;
 
         o2net_hand = kzalloc(sizeof(struct o2net_handshake), GFP_KERNEL);
         o2net_keep_req = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
         o2net_keep_resp = kzalloc(sizeof(struct o2net_msg), GFP_KERNEL);
-        if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) {
-                kfree(o2net_hand);
-                kfree(o2net_keep_req);
-                kfree(o2net_keep_resp);
-                return -ENOMEM;
-        }
+        if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp)
+                goto out;
 
         o2net_hand->protocol_version = cpu_to_be64(O2NET_PROTOCOL_VERSION);
         o2net_hand->connector_id = cpu_to_be64(1);
@@ -2181,6 +2198,14 @@ int o2net_init(void)
         }
 
         return 0;
+
+out:
+        kfree(o2net_hand);
+        kfree(o2net_keep_req);
+        kfree(o2net_keep_resp);
+
+        o2quo_exit();
+        return -ENOMEM;
 }
 
 void o2net_exit(void)
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c
index 18f13c2e4a10..149eb556b8c6 100644
--- a/fs/ocfs2/dlm/dlmdebug.c
+++ b/fs/ocfs2/dlm/dlmdebug.c
@@ -647,41 +647,30 @@ static const struct seq_operations debug_lockres_ops = {
 static int debug_lockres_open(struct inode *inode, struct file *file)
 {
         struct dlm_ctxt *dlm = inode->i_private;
-        int ret = -ENOMEM;
-        struct seq_file *seq;
-        struct debug_lockres *dl = NULL;
+        struct debug_lockres *dl;
+        void *buf;
 
-        dl = kzalloc(sizeof(struct debug_lockres), GFP_KERNEL);
-        if (!dl) {
-                mlog_errno(ret);
+        buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        if (!buf)
                 goto bail;
-        }
 
-        dl->dl_len = PAGE_SIZE;
-        dl->dl_buf = kmalloc(dl->dl_len, GFP_KERNEL);
-        if (!dl->dl_buf) {
-                mlog_errno(ret);
-                goto bail;
-        }
+        dl = __seq_open_private(file, &debug_lockres_ops, sizeof(*dl));
+        if (!dl)
+                goto bailfree;
 
-        ret = seq_open(file, &debug_lockres_ops);
-        if (ret) {
-                mlog_errno(ret);
-                goto bail;
-        }
-
-        seq = file->private_data;
-        seq->private = dl;
+        dl->dl_len = PAGE_SIZE;
+        dl->dl_buf = buf;
 
         dlm_grab(dlm);
         dl->dl_ctxt = dlm;
 
         return 0;
+
+bailfree:
+        kfree(buf);
 bail:
-        if (dl)
-                kfree(dl->dl_buf);
-        kfree(dl);
-        return ret;
+        mlog_errno(-ENOMEM);
+        return -ENOMEM;
 }
 
 static int debug_lockres_release(struct inode *inode, struct file *file)
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 3fcf205ee900..02d315fef432 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -839,7 +839,7 @@ static int dlm_query_join_handler(struct o2net_msg *msg, u32 len, void *data,
          * to back off and try again.  This gives heartbeat a chance
          * to catch up.
          */
-        if (!o2hb_check_node_heartbeating(query->node_idx)) {
+        if (!o2hb_check_node_heartbeating_no_sem(query->node_idx)) {
                 mlog(0, "node %u is not in our live map yet\n",
                      query->node_idx);
 
@@ -1975,24 +1975,22 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
 
         dlm = kzalloc(sizeof(*dlm), GFP_KERNEL);
         if (!dlm) {
-                mlog_errno(-ENOMEM);
+                ret = -ENOMEM;
+                mlog_errno(ret);
                 goto leave;
         }
 
         dlm->name = kstrdup(domain, GFP_KERNEL);
         if (dlm->name == NULL) {
-                mlog_errno(-ENOMEM);
-                kfree(dlm);
-                dlm = NULL;
+                ret = -ENOMEM;
+                mlog_errno(ret);
                 goto leave;
         }
 
         dlm->lockres_hash = (struct hlist_head **)dlm_alloc_pagevec(DLM_HASH_PAGES);
         if (!dlm->lockres_hash) {
-                mlog_errno(-ENOMEM);
-                kfree(dlm->name);
-                kfree(dlm);
-                dlm = NULL;
+                ret = -ENOMEM;
+                mlog_errno(ret);
                 goto leave;
         }
 
@@ -2002,11 +2000,8 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
         dlm->master_hash = (struct hlist_head **)
                                 dlm_alloc_pagevec(DLM_HASH_PAGES);
         if (!dlm->master_hash) {
-                mlog_errno(-ENOMEM);
-                dlm_free_pagevec((void **)dlm->lockres_hash, DLM_HASH_PAGES);
-                kfree(dlm->name);
-                kfree(dlm);
-                dlm = NULL;
+                ret = -ENOMEM;
+                mlog_errno(ret);
                 goto leave;
         }
 
@@ -2017,14 +2012,8 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
         dlm->node_num = o2nm_this_node();
 
         ret = dlm_create_debugfs_subroot(dlm);
-        if (ret < 0) {
-                dlm_free_pagevec((void **)dlm->master_hash, DLM_HASH_PAGES);
-                dlm_free_pagevec((void **)dlm->lockres_hash, DLM_HASH_PAGES);
-                kfree(dlm->name);
-                kfree(dlm);
-                dlm = NULL;
+        if (ret < 0)
                 goto leave;
-        }
 
         spin_lock_init(&dlm->spinlock);
         spin_lock_init(&dlm->master_lock);
@@ -2085,6 +2074,19 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
                   atomic_read(&dlm->dlm_refs.refcount));
 
 leave:
+        if (ret < 0 && dlm) {
+                if (dlm->master_hash)
+                        dlm_free_pagevec((void **)dlm->master_hash,
+                                        DLM_HASH_PAGES);
+
+                if (dlm->lockres_hash)
+                        dlm_free_pagevec((void **)dlm->lockres_hash,
+                                        DLM_HASH_PAGES);
+
+                kfree(dlm->name);
+                kfree(dlm);
+                dlm = NULL;
+        }
         return dlm;
 }
 
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 3ec906ef5d9a..215e41abf101 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -625,9 +625,6 @@ struct dlm_lock_resource *dlm_new_lockres(struct dlm_ctxt *dlm,
         return res;
 
 error:
-        if (res && res->lockname.name)
-                kmem_cache_free(dlm_lockname_cache, (void *)res->lockname.name);
-
         if (res)
                 kmem_cache_free(dlm_lockres_cache, res);
         return NULL;
@@ -655,12 +652,9 @@ void dlm_lockres_clear_refmap_bit(struct dlm_ctxt *dlm,
         clear_bit(bit, res->refmap);
 }
 
-
-void dlm_lockres_grab_inflight_ref(struct dlm_ctxt *dlm,
+static void __dlm_lockres_grab_inflight_ref(struct dlm_ctxt *dlm,
                                    struct dlm_lock_resource *res)
 {
-        assert_spin_locked(&res->spinlock);
-
         res->inflight_locks++;
 
         mlog(0, "%s: res %.*s, inflight++: now %u, %ps()\n", dlm->name,
@@ -668,6 +662,13 @@ void dlm_lockres_grab_inflight_ref(struct dlm_ctxt *dlm,
              __builtin_return_address(0));
 }
 
+void dlm_lockres_grab_inflight_ref(struct dlm_ctxt *dlm,
+                                   struct dlm_lock_resource *res)
+{
+        assert_spin_locked(&res->spinlock);
+        __dlm_lockres_grab_inflight_ref(dlm, res);
+}
+
 void dlm_lockres_drop_inflight_ref(struct dlm_ctxt *dlm,
                                    struct dlm_lock_resource *res)
 {
@@ -894,10 +895,8 @@ lookup:
         /* finally add the lockres to its hash bucket */
         __dlm_insert_lockres(dlm, res);
 
-        /* Grab inflight ref to pin the resource */
-        spin_lock(&res->spinlock);
-        dlm_lockres_grab_inflight_ref(dlm, res);
-        spin_unlock(&res->spinlock);
+        /* since this lockres is new it doesn't not require the spinlock */
+        __dlm_lockres_grab_inflight_ref(dlm, res);
 
         /* get an extra ref on the mle in case this is a BLOCK
          * if so, the creator of the BLOCK may try to put the last
@@ -2037,6 +2036,10 @@ kill:
              "and killing the other node now!  This node is OK and can continue.\n");
         __dlm_print_one_lock_resource(res);
         spin_unlock(&res->spinlock);
+        spin_lock(&dlm->master_lock);
+        if (mle)
+                __dlm_put_mle(mle);
+        spin_unlock(&dlm->master_lock);
         spin_unlock(&dlm->spinlock);
         *ret_data = (void *)res;
         dlm_put(dlm);
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 45067faf5695..3365839d2971 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -1710,9 +1710,12 @@ int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data,
                                 BUG();
                         } else
                                 __dlm_lockres_grab_inflight_worker(dlm, res);
-                } else /* put.. incase we are not the master */
+                        spin_unlock(&res->spinlock);
+                } else {
+                        /* put.. incase we are not the master */
+                        spin_unlock(&res->spinlock);
                         dlm_lockres_put(res);
-                spin_unlock(&res->spinlock);
+                }
         }
         spin_unlock(&dlm->spinlock);
 
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 52cfe99ae056..21262f2b1654 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -2892,37 +2892,24 @@ static int ocfs2_dlm_debug_release(struct inode *inode, struct file *file)
 
 static int ocfs2_dlm_debug_open(struct inode *inode, struct file *file)
 {
-        int ret;
         struct ocfs2_dlm_seq_priv *priv;
-        struct seq_file *seq;
         struct ocfs2_super *osb;
 
-        priv = kzalloc(sizeof(struct ocfs2_dlm_seq_priv), GFP_KERNEL);
+        priv = __seq_open_private(file, &ocfs2_dlm_seq_ops, sizeof(*priv));
         if (!priv) {
-                ret = -ENOMEM;
-                mlog_errno(ret);
-                goto out;
+                mlog_errno(-ENOMEM);
+                return -ENOMEM;
         }
+
         osb = inode->i_private;
         ocfs2_get_dlm_debug(osb->osb_dlm_debug);
         priv->p_dlm_debug = osb->osb_dlm_debug;
         INIT_LIST_HEAD(&priv->p_iter_res.l_debug_list);
 
-        ret = seq_open(file, &ocfs2_dlm_seq_ops);
-        if (ret) {
-                kfree(priv);
-                mlog_errno(ret);
-                goto out;
-        }
-
-        seq = file->private_data;
-        seq->private = priv;
-
         ocfs2_add_lockres_tracking(&priv->p_iter_res,
                                    priv->p_dlm_debug);
 
-out:
-        return ret;
+        return 0;
 }
 
 static const struct file_operations ocfs2_dlm_debug_fops = {
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index f39482ee22f0..324dc93ac896 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -760,7 +760,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
         struct address_space *mapping = inode->i_mapping;
         struct page *page;
         unsigned long index = abs_from >> PAGE_CACHE_SHIFT;
-        handle_t *handle = NULL;
+        handle_t *handle;
         int ret = 0;
         unsigned zero_from, zero_to, block_start, block_end;
         struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
@@ -769,11 +769,17 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
         BUG_ON(abs_to > (((u64)index + 1) << PAGE_CACHE_SHIFT));
         BUG_ON(abs_from & (inode->i_blkbits - 1));
 
+        handle = ocfs2_zero_start_ordered_transaction(inode, di_bh);
+        if (IS_ERR(handle)) {
+                ret = PTR_ERR(handle);
+                goto out;
+        }
+
         page = find_or_create_page(mapping, index, GFP_NOFS);
         if (!page) {
                 ret = -ENOMEM;
                 mlog_errno(ret);
-                goto out;
+                goto out_commit_trans;
         }
 
         /* Get the offsets within the page that we want to zero */
@@ -805,15 +811,6 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
                         goto out_unlock;
                 }
 
-                if (!handle) {
-                        handle = ocfs2_zero_start_ordered_transaction(inode,
-                                                                      di_bh);
-                        if (IS_ERR(handle)) {
-                                ret = PTR_ERR(handle);
-                                handle = NULL;
-                                break;
-                        }
-                }
 
                 /* must not update i_size! */
                 ret = block_commit_write(page, block_start + 1,
@@ -824,27 +821,29 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
                         ret = 0;
         }
 
+        /*
+         * fs-writeback will release the dirty pages without page lock
+         * whose offset are over inode size, the release happens at
+         * block_write_full_page().
+         */
+        i_size_write(inode, abs_to);
+        inode->i_blocks = ocfs2_inode_sector_count(inode);
+        di->i_size = cpu_to_le64((u64)i_size_read(inode));
+        inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+        di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);
+        di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
+        di->i_mtime_nsec = di->i_ctime_nsec;
         if (handle) {
-                /*
-                 * fs-writeback will release the dirty pages without page lock
-                 * whose offset are over inode size, the release happens at
-                 * block_write_full_page().
-                 */
-                i_size_write(inode, abs_to);
-                inode->i_blocks = ocfs2_inode_sector_count(inode);
-                di->i_size = cpu_to_le64((u64)i_size_read(inode));
-                inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-                di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);
-                di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
-                di->i_mtime_nsec = di->i_ctime_nsec;
                 ocfs2_journal_dirty(handle, di_bh);
                 ocfs2_update_inode_fsync_trans(handle, inode, 1);
-                ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
         }
 
 out_unlock:
         unlock_page(page);
         page_cache_release(page);
+out_commit_trans:
+        if (handle)
+                ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
 out:
         return ret;
 }
diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h
index a6c991c0fc98..a9b76de46047 100644
--- a/fs/ocfs2/inode.h
+++ b/fs/ocfs2/inode.h
@@ -162,7 +162,7 @@ static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
 {
         int c_to_s_bits = OCFS2_SB(inode->i_sb)->s_clustersize_bits - 9;
 
-        return (blkcnt_t)(OCFS2_I(inode)->ip_clusters << c_to_s_bits);
+        return (blkcnt_t)OCFS2_I(inode)->ip_clusters << c_to_s_bits;
 }
 
 /* Validate that a bh contains a valid inode */
diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c
index 6219aaadeb08..74caffeeee1d 100644
--- a/fs/ocfs2/move_extents.c
+++ b/fs/ocfs2/move_extents.c
@@ -404,7 +404,7 @@ static int ocfs2_find_victim_alloc_group(struct inode *inode,
          * 'vict_blkno' was out of the valid range.
          */
         if ((vict_blkno < le64_to_cpu(rec->c_blkno)) ||
-            (vict_blkno >= (le32_to_cpu(ac_dinode->id1.bitmap1.i_total) <<
+            (vict_blkno >= ((u64)le32_to_cpu(ac_dinode->id1.bitmap1.i_total) <<
                                 bits_per_unit))) {
                 ret = -EINVAL;
                 goto out;
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index 13a8537d8e8b..720aa389e0ea 100644
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -591,7 +591,7 @@ static int ocfs2_control_release(struct inode *inode, struct file *file)
                  */
                 ocfs2_control_this_node = -1;
                 running_proto.pv_major = 0;
-                running_proto.pv_major = 0;
+                running_proto.pv_minor = 0;
         }
 
 out:
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index aa35d6309b93..93c85bc745e1 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -2536,6 +2536,7 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb)
         kfree(osb->journal);
         kfree(osb->local_alloc_copy);
         kfree(osb->uuid_str);
+        kfree(osb->vol_label);
         ocfs2_put_dlm_debug(osb->osb_dlm_debug);
         memset(osb, 0, sizeof(struct ocfs2_super));
 }