Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[mv-sheeva.git] / fs / ocfs2 / resize.c

diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c
index 739d452f61741f84da3f7d9afe860979148f2139..424adaa5f9005c9e4b0f5427de250d4925e3a95d 100644 (file)
--- a/fs/ocfs2/resize.c
+++ b/fs/ocfs2/resize.c
@@ -106,8 +106,8 @@ static int ocfs2_update_last_group_and_inode(handle_t *handle,
        mlog_entry("(new_clusters=%d, first_new_cluster = %u)\n",
                   new_clusters, first_new_cluster);
 
-       ret = ocfs2_journal_access(handle, bm_inode, group_bh,
-                                  OCFS2_JOURNAL_ACCESS_WRITE);
+       ret = ocfs2_journal_access_gd(handle, bm_inode, group_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
                goto out;
@@ -141,8 +141,8 @@ static int ocfs2_update_last_group_and_inode(handle_t *handle,
        }
 
        /* update the inode accordingly. */
-       ret = ocfs2_journal_access(handle, bm_inode, bm_bh,
-                                  OCFS2_JOURNAL_ACCESS_WRITE);
+       ret = ocfs2_journal_access_di(handle, bm_inode, bm_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
                goto out_rollback;
@@ -330,20 +330,14 @@ int ocfs2_group_extend(struct inode * inode, int new_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);
+       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)) {
@@ -396,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),
@@ -449,6 +418,7 @@ static int ocfs2_check_new_group(struct inode *inode,
        else
                ret = 0;
 
+out:
        return ret;
 }
 
@@ -566,8 +536,8 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
        cl = &fe->id2.i_chain;
        cr = &cl->cl_recs[input->chain];
 
-       ret = ocfs2_journal_access(handle, main_bm_inode, group_bh,
-                                  OCFS2_JOURNAL_ACCESS_WRITE);
+       ret = ocfs2_journal_access_gd(handle, main_bm_inode, group_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
                goto out_commit;
@@ -582,8 +552,8 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
                goto out_commit;
        }
 
-       ret = ocfs2_journal_access(handle, main_bm_inode, main_bm_bh,
-                                  OCFS2_JOURNAL_ACCESS_WRITE);
+       ret = ocfs2_journal_access_di(handle, main_bm_inode, main_bm_bh,
+                                     OCFS2_JOURNAL_ACCESS_WRITE);
        if (ret < 0) {
                mlog_errno(ret);
                goto out_commit;