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: (56 commits)
  ocfs2: Make cached block reads the common case.
  ocfs2: Kill the last naked wait_on_buffer() for cached reads.
  ocfs2: Move ocfs2_bread() into dir.c
  ocfs2: Simplify ocfs2_read_block()
  ocfs2: Require an inode for ocfs2_read_block(s)().
  ocfs2: Separate out sync reads from ocfs2_read_blocks()
  ocfs2: Refactor xattr list and remove ocfs2_xattr_handler().
  ocfs2: Calculate EA hash only by its suffix.
  ocfs2: Move trusted and user attribute support into xattr.c
  ocfs2: Uninline ocfs2_xattr_name_hash()
  ocfs2: Don't check for NULL before brelse()
  ocfs2: use smaller counters in ocfs2_remove_xattr_clusters_from_cache
  ocfs2: Documentation update for user_xattr / nouser_xattr mount options
  ocfs2: make la_debug_mutex static
  ocfs2: Remove pointless !!
  ocfs2: Add empty bucket support in xattr.
  ocfs2/xattr.c: Fix a bug when inserting xattr.
  ocfs2: Add xattr mount option in ocfs2_show_options()
  ocfs2: Switch over to JBD2.
  ocfs2: Add the 'inode64' mount option.
  ...

1 files changed, 5 insertions, 6 deletions

diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c
index 8166968e901..ffd48db229a 100644
--- a/fs/ocfs2/resize.c
+++ b/fs/ocfs2/resize.c
@@ -200,7 +200,7 @@ static int update_backups(struct inode * inode, u32 clusters, char *data)
                 if (cluster > clusters)
                         break;
 
-                ret = ocfs2_read_block(osb, blkno, &backup, 0, NULL);
+                ret = ocfs2_read_blocks_sync(osb, blkno, 1, &backup);
                 if (ret < 0) {
                         mlog_errno(ret);
                         break;
@@ -236,8 +236,8 @@ static void ocfs2_update_super_and_backups(struct inode *inode,
          * update the superblock last.
          * It doesn't matter if the write failed.
          */
-        ret = ocfs2_read_block(osb, OCFS2_SUPER_BLOCK_BLKNO,
-                               &super_bh, 0, NULL);
+        ret = ocfs2_read_blocks_sync(osb, OCFS2_SUPER_BLOCK_BLKNO, 1,
+                                     &super_bh);
         if (ret < 0) {
                 mlog_errno(ret);
                 goto out;
@@ -332,8 +332,7 @@ 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(osb, lgd_blkno, &group_bh, OCFS2_BH_CACHED,
-                               main_bm_inode);
+        ret = ocfs2_read_block(main_bm_inode, lgd_blkno, &group_bh);
         if (ret < 0) {
                 mlog_errno(ret);
                 goto out_unlock;
@@ -540,7 +539,7 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
                 goto out_unlock;
         }
 
-        ret = ocfs2_read_block(osb, input->group, &group_bh, 0, NULL);
+        ret = ocfs2_read_blocks_sync(osb, input->group, 1, &group_bh);
         if (ret < 0) {
                 mlog(ML_ERROR, "Can't read the group descriptor # %llu "
                      "from the device.", (unsigned long long)input->group);