21 files changed, 105 insertions, 123 deletions

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 17e6bdde96c5..dc7411fe185d 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -1025,7 +1025,7 @@ static int ocfs2_create_new_meta_bhs(handle_t *handle,
                 for(i = count;  i < (num_got + count); i++) {
                         bhs[i] = sb_getblk(osb->sb, first_blkno);
                         if (bhs[i] == NULL) {
-                                status = -EIO;
+                                status = -ENOMEM;
                                 mlog_errno(status);
                                 goto bail;
                         }
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index f37d3c0e2053..aeb44e879c51 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -80,6 +80,7 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,
 
         if ((u64)iblock >= ocfs2_clusters_to_blocks(inode->i_sb,
                                                     le32_to_cpu(fe->i_clusters))) {
+                err = -ENOMEM;
                 mlog(ML_ERROR, "block offset is outside the allocated size: "
                      "%llu\n", (unsigned long long)iblock);
                 goto bail;
@@ -92,6 +93,7 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock,
                             iblock;
                 buffer_cache_bh = sb_getblk(osb->sb, blkno);
                 if (!buffer_cache_bh) {
+                        err = -ENOMEM;
                         mlog(ML_ERROR, "couldn't getblock for symlink!\n");
                         goto bail;
                 }
@@ -592,26 +594,11 @@ static void ocfs2_dio_end_io(struct kiocb *iocb,
         ocfs2_rw_unlock(inode, level);
 }
 
-/*
- * ocfs2_invalidatepage() and ocfs2_releasepage() are shamelessly stolen
- * from ext3.  PageChecked() bits have been removed as OCFS2 does not
- * do journalled data.
- */
-static void ocfs2_invalidatepage(struct page *page, unsigned int offset,
-                                 unsigned int length)
-{
-        journal_t *journal = OCFS2_SB(page->mapping->host->i_sb)->journal->j_journal;
-
-        jbd2_journal_invalidatepage(journal, page, offset, length);
-}
-
 static int ocfs2_releasepage(struct page *page, gfp_t wait)
 {
-        journal_t *journal = OCFS2_SB(page->mapping->host->i_sb)->journal->j_journal;
-
         if (!page_has_buffers(page))
                 return 0;
-        return jbd2_journal_try_to_free_buffers(journal, page, wait);
+        return try_to_free_buffers(page);
 }
 
 static ssize_t ocfs2_direct_IO(int rw,
@@ -1802,8 +1789,7 @@ try_again:
                         data_ac->ac_resv = &OCFS2_I(inode)->ip_la_data_resv;
 
                 credits = ocfs2_calc_extend_credits(inode->i_sb,
-                                                    &di->id2.i_list,
-                                                    clusters_to_alloc);
+                                                    &di->id2.i_list);
 
         }
 
@@ -1897,10 +1883,14 @@ out_commit:
 out:
         ocfs2_free_write_ctxt(wc);
 
-        if (data_ac)
+        if (data_ac) {
                 ocfs2_free_alloc_context(data_ac);
-        if (meta_ac)
+                data_ac = NULL;
+        }
+        if (meta_ac) {
                 ocfs2_free_alloc_context(meta_ac);
+                meta_ac = NULL;
+        }
 
         if (ret == -ENOSPC && try_free) {
                 /*
@@ -2087,7 +2077,7 @@ const struct address_space_operations ocfs2_aops = {
         .write_end              = ocfs2_write_end,
         .bmap                   = ocfs2_bmap,
         .direct_IO              = ocfs2_direct_IO,
-        .invalidatepage         = ocfs2_invalidatepage,
+        .invalidatepage         = block_invalidatepage,
         .releasepage            = ocfs2_releasepage,
         .migratepage            = buffer_migrate_page,
         .is_partially_uptodate  = block_is_partially_uptodate,
diff --git a/fs/ocfs2/buffer_head_io.c b/fs/ocfs2/buffer_head_io.c
index 5d18ad10c27f..5b704c63a103 100644
--- a/fs/ocfs2/buffer_head_io.c
+++ b/fs/ocfs2/buffer_head_io.c
@@ -115,7 +115,7 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block,
                 if (bhs[i] == NULL) {
                         bhs[i] = sb_getblk(osb->sb, block++);
                         if (bhs[i] == NULL) {
-                                status = -EIO;
+                                status = -ENOMEM;
                                 mlog_errno(status);
                                 goto bail;
                         }
@@ -214,7 +214,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
                         bhs[i] = sb_getblk(sb, block++);
                         if (bhs[i] == NULL) {
                                 ocfs2_metadata_cache_io_unlock(ci);
-                                status = -EIO;
+                                status = -ENOMEM;
                                 mlog_errno(status);
                                 goto bail;
                         }
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 363f0dcc924f..73920ffda05b 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -35,6 +35,7 @@
 #include <linux/time.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
+#include <linux/bitmap.h>
 
 #include "heartbeat.h"
 #include "tcp.h"
@@ -282,15 +283,6 @@ struct o2hb_bio_wait_ctxt {
         int               wc_error;
 };
 
-static int o2hb_pop_count(void *map, int count)
-{
-        int i = -1, pop = 0;
-
-        while ((i = find_next_bit(map, count, i + 1)) < count)
-                pop++;
-        return pop;
-}
-
 static void o2hb_write_timeout(struct work_struct *work)
 {
         int failed, quorum;
@@ -307,9 +299,9 @@ static void o2hb_write_timeout(struct work_struct *work)
                 spin_lock_irqsave(&o2hb_live_lock, flags);
                 if (test_bit(reg->hr_region_num, o2hb_quorum_region_bitmap))
                         set_bit(reg->hr_region_num, o2hb_failed_region_bitmap);
-                failed = o2hb_pop_count(&o2hb_failed_region_bitmap,
+                failed = bitmap_weight(o2hb_failed_region_bitmap,
                                         O2NM_MAX_REGIONS);
-                quorum = o2hb_pop_count(&o2hb_quorum_region_bitmap,
+                quorum = bitmap_weight(o2hb_quorum_region_bitmap,
                                         O2NM_MAX_REGIONS);
                 spin_unlock_irqrestore(&o2hb_live_lock, flags);
 
@@ -765,7 +757,7 @@ static void o2hb_set_quorum_device(struct o2hb_region *reg)
          * If global heartbeat active, unpin all regions if the
          * region count > CUT_OFF
          */
-        if (o2hb_pop_count(&o2hb_quorum_region_bitmap,
+        if (bitmap_weight(o2hb_quorum_region_bitmap,
                            O2NM_MAX_REGIONS) > O2HB_PIN_CUT_OFF)
                 o2hb_region_unpin(NULL);
 unlock:
@@ -954,23 +946,9 @@ out:
         return changed;
 }
 
-/* This could be faster if we just implmented a find_last_bit, but I
- * don't think the circumstances warrant it. */
-static int o2hb_highest_node(unsigned long *nodes,
-                             int numbits)
+static int o2hb_highest_node(unsigned long *nodes, int numbits)
 {
-        int highest, node;
-
-        highest = numbits;
-        node = -1;
-        while ((node = find_next_bit(nodes, numbits, node + 1)) != -1) {
-                if (node >= numbits)
-                        break;
-
-                highest = node;
-        }
-
-        return highest;
+        return find_last_bit(nodes, numbits);
 }
 
 static int o2hb_do_disk_heartbeat(struct o2hb_region *reg)
@@ -1829,7 +1807,7 @@ static ssize_t o2hb_region_dev_write(struct o2hb_region *reg,
         live_threshold = O2HB_LIVE_THRESHOLD;
         if (o2hb_global_heartbeat_active()) {
                 spin_lock(&o2hb_live_lock);
-                if (o2hb_pop_count(&o2hb_region_bitmap, O2NM_MAX_REGIONS) == 1)
+                if (bitmap_weight(o2hb_region_bitmap, O2NM_MAX_REGIONS) == 1)
                         live_threshold <<= 1;
                 spin_unlock(&o2hb_live_lock);
         }
@@ -2180,7 +2158,7 @@ static void o2hb_heartbeat_group_drop_item(struct config_group *group,
         if (!o2hb_dependent_users)
                 goto unlock;
 
-        if (o2hb_pop_count(&o2hb_quorum_region_bitmap,
+        if (bitmap_weight(o2hb_quorum_region_bitmap,
                            O2NM_MAX_REGIONS) <= O2HB_PIN_CUT_OFF)
                 o2hb_region_pin(NULL);
 
@@ -2480,7 +2458,7 @@ static int o2hb_region_inc_user(const char *region_uuid)
         if (o2hb_dependent_users > 1)
                 goto unlock;
 
-        if (o2hb_pop_count(&o2hb_quorum_region_bitmap,
+        if (bitmap_weight(o2hb_quorum_region_bitmap,
                            O2NM_MAX_REGIONS) <= O2HB_PIN_CUT_OFF)
                 ret = o2hb_region_pin(NULL);
 
diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h
index baa2b9ef7eef..2260fb9e6508 100644
--- a/fs/ocfs2/cluster/masklog.h
+++ b/fs/ocfs2/cluster/masklog.h
@@ -199,7 +199,8 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits;
 #define mlog_errno(st) do {                                             \
         int _st = (st);                                                 \
         if (_st != -ERESTARTSYS && _st != -EINTR &&                     \
-            _st != AOP_TRUNCATED_PAGE && _st != -ENOSPC)                \
+            _st != AOP_TRUNCATED_PAGE && _st != -ENOSPC &&              \
+            _st != -EDQUOT)                                             \
                 mlog(ML_ERROR, "status = %lld\n", (long long)_st);      \
 } while (0)
 
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
index ef999729e274..0d3a97d2d5f6 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
@@ -70,9 +70,10 @@ static int ocfs2_dentry_revalidate(struct dentry *dentry, unsigned int flags)
          */
         if (inode == NULL) {
                 unsigned long gen = (unsigned long) dentry->d_fsdata;
-                unsigned long pgen =
-                        OCFS2_I(dentry->d_parent->d_inode)->ip_dir_lock_gen;
-
+                unsigned long pgen;
+                spin_lock(&dentry->d_lock);
+                pgen = OCFS2_I(dentry->d_parent->d_inode)->ip_dir_lock_gen;
+                spin_unlock(&dentry->d_lock);
                 trace_ocfs2_dentry_revalidate_negative(dentry->d_name.len,
                                                        dentry->d_name.name,
                                                        pgen, gen);
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 30544ce8e9f7..91a7e85ac8fd 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -2349,7 +2349,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb,
 
         dx_root_bh = sb_getblk(osb->sb, dr_blkno);
         if (dx_root_bh == NULL) {
-                ret = -EIO;
+                ret = -ENOMEM;
                 goto out;
         }
         ocfs2_set_new_buffer_uptodate(INODE_CACHE(dir), dx_root_bh);
@@ -2422,7 +2422,7 @@ static int ocfs2_dx_dir_format_cluster(struct ocfs2_super *osb,
         for (i = 0; i < num_dx_leaves; i++) {
                 bh = sb_getblk(osb->sb, start_blk + i);
                 if (bh == NULL) {
-                        ret = -EIO;
+                        ret = -ENOMEM;
                         goto out;
                 }
                 dx_leaves[i] = bh;
@@ -2929,7 +2929,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
         blkno = ocfs2_clusters_to_blocks(dir->i_sb, bit_off);
         dirdata_bh = sb_getblk(sb, blkno);
         if (!dirdata_bh) {
-                ret = -EIO;
+                ret = -ENOMEM;
                 mlog_errno(ret);
                 goto out_commit;
         }
@@ -3159,7 +3159,7 @@ static int ocfs2_do_extend_dir(struct super_block *sb,
 
         *new_bh = sb_getblk(sb, p_blkno);
         if (!*new_bh) {
-                status = -EIO;
+                status = -ENOMEM;
                 mlog_errno(status);
                 goto bail;
         }
@@ -3284,7 +3284,7 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
                 if (ocfs2_dir_resv_allowed(osb))
                         data_ac->ac_resv = &OCFS2_I(dir)->ip_la_data_resv;
 
-                credits = ocfs2_calc_extend_credits(sb, el, 1);
+                credits = ocfs2_calc_extend_credits(sb, el);
         } else {
                 spin_unlock(&OCFS2_I(dir)->ip_lock);
                 credits = OCFS2_SIMPLE_DIR_EXTEND_CREDITS;
@@ -3716,7 +3716,7 @@ static int ocfs2_dx_dir_rebalance_credits(struct ocfs2_super *osb,
 {
         int credits = ocfs2_clusters_to_blocks(osb->sb, 2);
 
-        credits += ocfs2_calc_extend_credits(osb->sb, &dx_root->dr_list, 1);
+        credits += ocfs2_calc_extend_credits(osb->sb, &dx_root->dr_list);
         credits += ocfs2_quota_trans_credits(osb->sb);
         return credits;
 }
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index cf0f103963b1..af3f7aa73e13 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -1885,8 +1885,10 @@ ok:
                          * up nodes that this node contacted */
                         while ((nn = find_next_bit (mle->response_map, O2NM_MAX_NODES,
                                                     nn+1)) < O2NM_MAX_NODES) {
-                                if (nn != dlm->node_num && nn != assert->node_idx)
+                                if (nn != dlm->node_num && nn != assert->node_idx) {
                                         master_request = 1;
+                                        break;
+                                }
                         }
                 }
                 mle->master = assert->node_idx;
@@ -2354,6 +2356,10 @@ static int dlm_is_lockres_migrateable(struct dlm_ctxt *dlm,
 
         assert_spin_locked(&res->spinlock);
 
+        /* delay migration when the lockres is in MIGRATING state */
+        if (res->state & DLM_LOCK_RES_MIGRATING)
+                return 0;
+
         if (res->owner != dlm->node_num)
                 return 0;
 
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 0b5adca1b178..7035af09cc03 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -1886,6 +1886,13 @@ static int dlm_process_recovery_data(struct dlm_ctxt *dlm,
                 if (ml->type == LKM_NLMODE)
                         goto skip_lvb;
 
+                /*
+                 * If the lock is in the blocked list it can't have a valid lvb,
+                 * so skip it
+                 */
+                if (ml->list == DLM_BLOCKED_LIST)
+                        goto skip_lvb;
+
                 if (!dlm_lvb_is_empty(mres->lvb)) {
                         if (lksb->flags & DLM_LKSB_PUT_LVB) {
                                 /* other node was trying to update
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 3a44a648dae7..3407b2c62b21 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -1304,7 +1304,7 @@ static int ocfs2_wait_for_mask(struct ocfs2_mask_waiter *mw)
 {
         wait_for_completion(&mw->mw_complete);
         /* Re-arm the completion in case we want to wait on it again */
-        INIT_COMPLETION(mw->mw_complete);
+        reinit_completion(&mw->mw_complete);
         return mw->mw_status;
 }
 
@@ -1355,7 +1355,7 @@ static int ocfs2_wait_for_mask_interruptible(struct ocfs2_mask_waiter *mw,
         else
                 ret = mw->mw_status;
         /* Re-arm the completion in case we want to wait on it again */
-        INIT_COMPLETION(mw->mw_complete);
+        reinit_completion(&mw->mw_complete);
         return ret;
 }
 
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index d71903c6068b..6fff128cad16 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -580,7 +580,7 @@ static int __ocfs2_extend_allocation(struct inode *inode, u32 logical_start,
         int did_quota = 0;
 
         /*
-         * This function only exists for file systems which don't
+         * Unwritten extent only exists for file systems which
          * support holes.
          */
         BUG_ON(mark_unwritten && !ocfs2_sparse_alloc(osb));
@@ -603,8 +603,7 @@ restart_all:
                 goto leave;
         }
 
-        credits = ocfs2_calc_extend_credits(osb->sb, &fe->id2.i_list,
-                                            clusters_to_add);
+        credits = ocfs2_calc_extend_credits(osb->sb, &fe->id2.i_list);
         handle = ocfs2_start_trans(osb, credits);
         if (IS_ERR(handle)) {
                 status = PTR_ERR(handle);
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index f87f9bd1edff..f29a90fde619 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -386,19 +386,9 @@ static int ocfs2_read_locked_inode(struct inode *inode,
         u32 generation = 0;
 
         status = -EINVAL;
-        if (inode == NULL || inode->i_sb == NULL) {
-                mlog(ML_ERROR, "bad inode\n");
-                return status;
-        }
         sb = inode->i_sb;
         osb = OCFS2_SB(sb);
 
-        if (!args) {
-                mlog(ML_ERROR, "bad inode args\n");
-                make_bad_inode(inode);
-                return status;
-        }
-
         /*
          * To improve performance of cold-cache inode stats, we take
          * the cluster lock here if possible.
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h
index 0b479bab3671..9ff4e8cf9d97 100644
--- a/fs/ocfs2/journal.h
+++ b/fs/ocfs2/journal.h
@@ -524,8 +524,7 @@ static inline int ocfs2_calc_dxi_expand_credits(struct super_block *sb)
  * the result may be wrong.
  */
 static inline int ocfs2_calc_extend_credits(struct super_block *sb,
-                                            struct ocfs2_extent_list *root_el,
-                                            u32 bits_wanted)
+                                            struct ocfs2_extent_list *root_el)
 {
         int bitmap_blocks, sysfile_bitmap_blocks, extent_blocks;
 
diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c
index 3d3f3c83065c..631a98213474 100644
--- a/fs/ocfs2/move_extents.c
+++ b/fs/ocfs2/move_extents.c
@@ -201,8 +201,7 @@ static int ocfs2_lock_allocators_move_extents(struct inode *inode,
                 }
         }
 
-        *credits += ocfs2_calc_extend_credits(osb->sb, et->et_root_el,
-                                              clusters_to_move + 2);
+        *credits += ocfs2_calc_extend_credits(osb->sb, et->et_root_el);
 
         mlog(0, "reserve metadata_blocks: %d, data_clusters: %u, credits: %d\n",
              extra_blocks, clusters_to_move, *credits);
@@ -1067,8 +1066,10 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp)
         if (status)
                 return status;
 
-        if ((!S_ISREG(inode->i_mode)) || !(filp->f_mode & FMODE_WRITE))
+        if ((!S_ISREG(inode->i_mode)) || !(filp->f_mode & FMODE_WRITE)) {
+                status = -EPERM;
                 goto out_drop;
+        }
 
         if (inode->i_flags & (S_IMMUTABLE|S_APPEND)) {
                 status = -EPERM;
@@ -1090,8 +1091,10 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp)
                 goto out_free;
         }
 
-        if (range.me_start > i_size_read(inode))
+        if (range.me_start > i_size_read(inode)) {
+                status = -EINVAL;
                 goto out_free;
+        }
 
         if (range.me_start + range.me_len > i_size_read(inode))
                         range.me_len = i_size_read(inode) - range.me_start;
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index be3f8676a438..4f791f6d27d0 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -489,7 +489,7 @@ static int __ocfs2_mknod_locked(struct inode *dir,
 
         *new_fe_bh = sb_getblk(osb->sb, fe_blkno);
         if (!*new_fe_bh) {
-                status = -EIO;
+                status = -ENOMEM;
                 mlog_errno(status);
                 goto leave;
         }
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index bf4dfc14bb2c..55767e1ba724 100644
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -612,6 +612,11 @@ static int ocfs2_create_refcount_tree(struct inode *inode,
         }
 
         new_bh = sb_getblk(inode->i_sb, first_blkno);
+        if (!new_bh) {
+                ret = -ENOMEM;
+                mlog_errno(ret);
+                goto out_commit;
+        }
         ocfs2_set_new_buffer_uptodate(&new_tree->rf_ci, new_bh);
 
         ret = ocfs2_journal_access_rb(handle, &new_tree->rf_ci, new_bh,
@@ -1310,7 +1315,7 @@ static int ocfs2_expand_inline_ref_root(handle_t *handle,
 
         new_bh = sb_getblk(sb, blkno);
         if (new_bh == NULL) {
-                ret = -EIO;
+                ret = -ENOMEM;
                 mlog_errno(ret);
                 goto out;
         }
@@ -1561,7 +1566,7 @@ static int ocfs2_new_leaf_refcount_block(handle_t *handle,
 
         new_bh = sb_getblk(sb, blkno);
         if (new_bh == NULL) {
-                ret = -EIO;
+                ret = -ENOMEM;
                 mlog_errno(ret);
                 goto out;
         }
@@ -2502,8 +2507,7 @@ static int ocfs2_calc_refcount_meta_credits(struct super_block *sb,
                 ocfs2_init_refcount_extent_tree(&et, ci, ref_root_bh);
                 *meta_add += ocfs2_extend_meta_needed(et.et_root_el);
                 *credits += ocfs2_calc_extend_credits(sb,
-                                                      et.et_root_el,
-                                                      ref_blocks);
+                                                      et.et_root_el);
         } else {
                 *credits += OCFS2_EXPAND_REFCOUNT_TREE_CREDITS;
                 *meta_add += 1;
@@ -2874,8 +2878,7 @@ static int ocfs2_lock_refcount_allocators(struct super_block *sb,
                 meta_add =
                         ocfs2_extend_meta_needed(et->et_root_el);
 
-        *credits += ocfs2_calc_extend_credits(sb, et->et_root_el,
-                                              num_clusters + 2);
+        *credits += ocfs2_calc_extend_credits(sb, et->et_root_el);
 
         ret = ocfs2_calc_refcount_meta_credits(sb, ref_ci, ref_root_bh,
                                                p_cluster, num_clusters,
@@ -3031,7 +3034,7 @@ int ocfs2_duplicate_clusters_by_jbd(handle_t *handle,
         for (i = 0; i < blocks; i++, old_block++, new_block++) {
                 new_bh = sb_getblk(osb->sb, new_block);
                 if (new_bh == NULL) {
-                        ret = -EIO;
+                        ret = -ENOMEM;
                         mlog_errno(ret);
                         break;
                 }
@@ -3625,8 +3628,7 @@ int ocfs2_refcounted_xattr_delete_need(struct inode *inode,
 
                 ocfs2_init_refcount_extent_tree(&et, ref_ci, ref_root_bh);
                 *credits += ocfs2_calc_extend_credits(inode->i_sb,
-                                                      et.et_root_el,
-                                                      ref_blocks);
+                                                      et.et_root_el);
         }
 
 out:
diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c
index ec55add7604a..822ebc10f281 100644
--- a/fs/ocfs2/resize.c
+++ b/fs/ocfs2/resize.c
@@ -469,6 +469,7 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
         struct ocfs2_chain_list *cl;
         struct ocfs2_chain_rec *cr;
         u16 cl_bpc;
+        u64 bg_ptr;
 
         if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))
                 return -EROFS;
@@ -513,7 +514,7 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
         ret = ocfs2_verify_group_and_input(main_bm_inode, fe, input, group_bh);
         if (ret) {
                 mlog_errno(ret);
-                goto out_unlock;
+                goto out_free_group_bh;
         }
 
         trace_ocfs2_group_add((unsigned long long)input->group,
@@ -523,7 +524,7 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
         if (IS_ERR(handle)) {
                 mlog_errno(PTR_ERR(handle));
                 ret = -EINVAL;
-                goto out_unlock;
+                goto out_free_group_bh;
         }
 
         cl_bpc = le16_to_cpu(fe->id2.i_chain.cl_bpc);
@@ -538,12 +539,14 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
         }
 
         group = (struct ocfs2_group_desc *)group_bh->b_data;
+        bg_ptr = le64_to_cpu(group->bg_next_group);
         group->bg_next_group = cr->c_blkno;
         ocfs2_journal_dirty(handle, group_bh);
 
         ret = ocfs2_journal_access_di(handle, INODE_CACHE(main_bm_inode),
                                       main_bm_bh, OCFS2_JOURNAL_ACCESS_WRITE);
         if (ret < 0) {
+                group->bg_next_group = cpu_to_le64(bg_ptr);
                 mlog_errno(ret);
                 goto out_commit;
         }
@@ -574,8 +577,11 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
 
 out_commit:
         ocfs2_commit_trans(osb, handle);
-out_unlock:
+
+out_free_group_bh:
         brelse(group_bh);
+
+out_unlock:
         brelse(main_bm_bh);
 
         ocfs2_inode_unlock(main_bm_inode, 1);
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
index 39abf89697ed..cb7ec0b63ddc 100644
--- a/fs/ocfs2/stackglue.c
+++ b/fs/ocfs2/stackglue.c
@@ -643,7 +643,7 @@ error:
 
 #define FS_OCFS2_NM             1
 
-static ctl_table ocfs2_nm_table[] = {
+static struct ctl_table ocfs2_nm_table[] = {
         {
                 .procname       = "hb_ctl_path",
                 .data           = ocfs2_hb_ctl_path,
@@ -654,7 +654,7 @@ static ctl_table ocfs2_nm_table[] = {
         { }
 };
 
-static ctl_table ocfs2_mod_table[] = {
+static struct ctl_table ocfs2_mod_table[] = {
         {
                 .procname       = "nm",
                 .data           = NULL,
@@ -665,7 +665,7 @@ static ctl_table ocfs2_mod_table[] = {
         { }
 };
 
-static ctl_table ocfs2_kern_table[] = {
+static struct ctl_table ocfs2_kern_table[] = {
         {
                 .procname       = "ocfs2",
                 .data           = NULL,
@@ -676,7 +676,7 @@ static ctl_table ocfs2_kern_table[] = {
         { }
 };
 
-static ctl_table ocfs2_root_table[] = {
+static struct ctl_table ocfs2_root_table[] = {
         {
                 .procname       = "fs",
                 .data           = NULL,
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index 5397c07ce608..2c91452c4047 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -481,7 +481,7 @@ ocfs2_block_group_alloc_contig(struct ocfs2_super *osb, handle_t *handle,
 
         bg_bh = sb_getblk(osb->sb, bg_blkno);
         if (!bg_bh) {
-                status = -EIO;
+                status = -ENOMEM;
                 mlog_errno(status);
                 goto bail;
         }
@@ -661,7 +661,7 @@ ocfs2_block_group_alloc_discontig(handle_t *handle,
 
         bg_bh = sb_getblk(osb->sb, bg_blkno);
         if (!bg_bh) {
-                status = -EIO;
+                status = -ENOMEM;
                 mlog_errno(status);
                 goto bail;
         }
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 121da2dc3be8..c41492957aa5 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1848,8 +1848,8 @@ static int ocfs2_get_sector(struct super_block *sb,
 
         *bh = sb_getblk(sb, block);
         if (!*bh) {
-                mlog_errno(-EIO);
-                return -EIO;
+                mlog_errno(-ENOMEM);
+                return -ENOMEM;
         }
         lock_buffer(*bh);
         if (!buffer_dirty(*bh))
@@ -1924,7 +1924,7 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
 {
         int tmp, hangup_needed = 0;
         struct ocfs2_super *osb = NULL;
-        char nodestr[8];
+        char nodestr[12];
 
         trace_ocfs2_dismount_volume(sb);
 
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 6ce0686eab72..f0a1326d9bba 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -377,7 +377,7 @@ static int ocfs2_init_xattr_bucket(struct ocfs2_xattr_bucket *bucket,
                 bucket->bu_bhs[i] = sb_getblk(bucket->bu_inode->i_sb,
                                               xb_blkno + i);
                 if (!bucket->bu_bhs[i]) {
-                        rc = -EIO;
+                        rc = -ENOMEM;
                         mlog_errno(rc);
                         break;
                 }
@@ -754,8 +754,7 @@ static int ocfs2_xattr_extend_allocation(struct inode *inode,
                         BUG_ON(why == RESTART_META);
 
                         credits = ocfs2_calc_extend_credits(inode->i_sb,
-                                                            &vb->vb_xv->xr_list,
-                                                            clusters_to_add);
+                                                            &vb->vb_xv->xr_list);
                         status = ocfs2_extend_trans(handle, credits);
                         if (status < 0) {
                                 status = -ENOMEM;
@@ -2865,6 +2864,12 @@ static int ocfs2_create_xattr_block(struct inode *inode,
         }
 
         new_bh = sb_getblk(inode->i_sb, first_blkno);
+        if (!new_bh) {
+                ret = -ENOMEM;
+                mlog_errno(ret);
+                goto end;
+        }
+
         ocfs2_set_new_buffer_uptodate(INODE_CACHE(inode), new_bh);
 
         ret = ocfs2_journal_access_xb(ctxt->handle, INODE_CACHE(inode),
@@ -3040,8 +3045,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
                 if (xi->xi_value_len > OCFS2_XATTR_INLINE_SIZE) {
                         clusters_add += new_clusters;
                         credits += ocfs2_calc_extend_credits(inode->i_sb,
-                                                        &def_xv.xv.xr_list,
-                                                        new_clusters);
+                                                        &def_xv.xv.xr_list);
                 }
 
                 goto meta_guess;
@@ -3106,8 +3110,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
                         if (!ocfs2_xattr_is_local(xe))
                                 credits += ocfs2_calc_extend_credits(
                                                         inode->i_sb,
-                                                        &def_xv.xv.xr_list,
-                                                        new_clusters);
+                                                        &def_xv.xv.xr_list);
                         goto out;
                 }
         }
@@ -3132,9 +3135,7 @@ static int ocfs2_calc_xattr_set_need(struct inode *inode,
                         meta_add += ocfs2_extend_meta_needed(&xv->xr_list);
                         clusters_add += new_clusters - old_clusters;
                         credits += ocfs2_calc_extend_credits(inode->i_sb,
-                                                             &xv->xr_list,
-                                                             new_clusters -
-                                                             old_clusters);
+                                                             &xv->xr_list);
                         if (value_size >= OCFS2_XATTR_ROOT_SIZE)
                                 goto out;
                 }
@@ -3180,7 +3181,7 @@ meta_guess:
                                  &xb->xb_attrs.xb_root.xt_list;
                         meta_add += ocfs2_extend_meta_needed(el);
                         credits += ocfs2_calc_extend_credits(inode->i_sb,
-                                                             el, 1);
+                                                             el);
                 } else
                         credits += OCFS2_SUBALLOC_ALLOC + 1;
 
@@ -6216,8 +6217,7 @@ static int ocfs2_value_metas_in_xattr_header(struct super_block *sb,
                           le16_to_cpu(xv->xr_list.l_next_free_rec);
 
                 *credits += ocfs2_calc_extend_credits(sb,
-                                                &def_xv.xv.xr_list,
-                                                le32_to_cpu(xv->xr_clusters));
+                                                &def_xv.xv.xr_list);
 
                 /*
                  * If the value is a tree with depth > 1, We don't go deep
@@ -6782,7 +6782,7 @@ static int ocfs2_lock_reflink_xattr_rec_allocators(
                 metas.num_metas += ocfs2_extend_meta_needed(xt_et->et_root_el);
 
         *credits += ocfs2_calc_extend_credits(osb->sb,
-                                              xt_et->et_root_el, len);
+                                              xt_et->et_root_el);
 
         if (metas.num_metas) {
                 ret = ocfs2_reserve_new_metadata_blocks(osb, metas.num_metas,