ocfs2: Add journal_access functions with jbd2 triggers.

[cascardo/linux.git] / fs / ocfs2 / resize.c

diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c
index 92dcd93..867de3e 100644 (file)
--- a/fs/ocfs2/resize.c
+++ b/fs/ocfs2/resize.c
@@ -314,6 +314,10 @@ int ocfs2_group_extend(struct inode * inode, int new_clusters)
 
        fe = (struct ocfs2_dinode *)main_bm_bh->b_data;
 
+       /* main_bm_bh is validated by inode read inside ocfs2_inode_lock(),
+        * so any corruption is a code bug. */
+       BUG_ON(!OCFS2_IS_VALID_DINODE(fe));
+
        if (le16_to_cpu(fe->id2.i_chain.cl_cpg) !=
                                 ocfs2_group_bitmap_size(osb->sb) * 8) {
                mlog(ML_ERROR, "The disk is too old and small. "
@@ -322,31 +326,18 @@ int ocfs2_group_extend(struct inode * inode, int new_clusters)
                goto out_unlock;
        }
 
-       if (!OCFS2_IS_VALID_DINODE(fe)) {
-               OCFS2_RO_ON_INVALID_DINODE(main_bm_inode->i_sb, fe);
-               ret = -EIO;
-               goto out_unlock;
-       }
-
        first_new_cluster = le32_to_cpu(fe->i_clusters);
        lgd_blkno = ocfs2_which_cluster_group(main_bm_inode,
                                              first_new_cluster - 1);
 
-       ret = ocfs2_read_block(main_bm_inode, lgd_blkno, &group_bh,
-                              OCFS2_BH_CACHED);
+       ret = ocfs2_read_group_descriptor(main_bm_inode, fe, lgd_blkno,
+                                         &group_bh);
        if (ret < 0) {
                mlog_errno(ret);
                goto out_unlock;
        }
-
        group = (struct ocfs2_group_desc *)group_bh->b_data;
 
-       ret = ocfs2_check_group_descriptor(inode->i_sb, fe, group);
-       if (ret) {
-               mlog_errno(ret);
-               goto out_unlock;
-       }
-
        cl_bpc = le16_to_cpu(fe->id2.i_chain.cl_bpc);
        if (le16_to_cpu(group->bg_bits) / cl_bpc + new_clusters >
                le16_to_cpu(fe->id2.i_chain.cl_cpg)) {
@@ -399,41 +390,16 @@ static int ocfs2_check_new_group(struct inode *inode,
                                 struct buffer_head *group_bh)
 {
        int ret;
-       struct ocfs2_group_desc *gd;
+       struct ocfs2_group_desc *gd =
+               (struct ocfs2_group_desc *)group_bh->b_data;
        u16 cl_bpc = le16_to_cpu(di->id2.i_chain.cl_bpc);
-       unsigned int max_bits = le16_to_cpu(di->id2.i_chain.cl_cpg) *
-                               le16_to_cpu(di->id2.i_chain.cl_bpc);
-
 
-       gd = (struct ocfs2_group_desc *)group_bh->b_data;
+       ret = ocfs2_check_group_descriptor(inode->i_sb, di, group_bh);
+       if (ret)
+               goto out;
 
-       ret = -EIO;
-       if (!OCFS2_IS_VALID_GROUP_DESC(gd))
-               mlog(ML_ERROR, "Group descriptor # %llu isn't valid.\n",
-                    (unsigned long long)le64_to_cpu(gd->bg_blkno));
-       else if (di->i_blkno != gd->bg_parent_dinode)
-               mlog(ML_ERROR, "Group descriptor # %llu has bad parent "
-                    "pointer (%llu, expected %llu)\n",
-                    (unsigned long long)le64_to_cpu(gd->bg_blkno),
-                    (unsigned long long)le64_to_cpu(gd->bg_parent_dinode),
-                    (unsigned long long)le64_to_cpu(di->i_blkno));
-       else if (le16_to_cpu(gd->bg_bits) > max_bits)
-               mlog(ML_ERROR, "Group descriptor # %llu has bit count of %u\n",
-                    (unsigned long long)le64_to_cpu(gd->bg_blkno),
-                    le16_to_cpu(gd->bg_bits));
-       else if (le16_to_cpu(gd->bg_free_bits_count) > le16_to_cpu(gd->bg_bits))
-               mlog(ML_ERROR, "Group descriptor # %llu has bit count %u but "
-                    "claims that %u are free\n",
-                    (unsigned long long)le64_to_cpu(gd->bg_blkno),
-                    le16_to_cpu(gd->bg_bits),
-                    le16_to_cpu(gd->bg_free_bits_count));
-       else if (le16_to_cpu(gd->bg_bits) > (8 * le16_to_cpu(gd->bg_size)))
-               mlog(ML_ERROR, "Group descriptor # %llu has bit count %u but "
-                    "max bitmap bits of %u\n",
-                    (unsigned long long)le64_to_cpu(gd->bg_blkno),
-                    le16_to_cpu(gd->bg_bits),
-                    8 * le16_to_cpu(gd->bg_size));
-       else if (le16_to_cpu(gd->bg_chain) != input->chain)
+       ret = -EINVAL;
+       if (le16_to_cpu(gd->bg_chain) != input->chain)
                mlog(ML_ERROR, "Group descriptor # %llu has bad chain %u "
                     "while input has %u set.\n",
                     (unsigned long long)le64_to_cpu(gd->bg_blkno),
@@ -452,6 +418,7 @@ static int ocfs2_check_new_group(struct inode *inode,
        else
                ret = 0;
 
+out:
        return ret;
 }