Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux...

[~andy/linux] / fs / ocfs2 / slot_map.c

diff --git a/fs/ocfs2/slot_map.c b/fs/ocfs2/slot_map.c
index 63fb1b26d964b2051c7a5bb44046a3831884887a..bdda2d8f85080a5a883c1b01b4cc1fbe68d83d18 100644 (file)
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
@@ -73,8 +73,6 @@ static void ocfs2_set_slot(struct ocfs2_slot_info *si,
                           int slot_num, unsigned int node_num)
 {
        BUG_ON((slot_num < 0) || (slot_num >= si->si_num_slots));
-       BUG_ON((node_num == O2NM_INVALID_NODE_NUM) ||
-              (node_num >= O2NM_MAX_NODES));
 
        si->si_slots[slot_num].sl_valid = 1;
        si->si_slots[slot_num].sl_node_num = node_num;
@@ -152,8 +150,8 @@ int ocfs2_refresh_slot_info(struct ocfs2_super *osb)
         * be !NULL.  Thus, ocfs2_read_blocks() will ignore blocknr.  If
         * this is not true, the read of -1 (UINT64_MAX) will fail.
         */
-       ret = ocfs2_read_blocks(osb, -1, si->si_blocks, si->si_bh, 0,
-                               si->si_inode);
+       ret = ocfs2_read_blocks(si->si_inode, -1, si->si_blocks, si->si_bh,
+                               OCFS2_BH_IGNORE_CACHE);
        if (ret == 0) {
                spin_lock(&osb->osb_lock);
                ocfs2_update_slot_info(si);
@@ -406,7 +404,8 @@ static int ocfs2_map_slot_buffers(struct ocfs2_super *osb,
                     (unsigned long long)blkno);
 
                bh = NULL;  /* Acquire a fresh bh */
-               status = ocfs2_read_block(osb, blkno, &bh, 0, si->si_inode);
+               status = ocfs2_read_blocks(si->si_inode, blkno, 1, &bh,
+                                          OCFS2_BH_IGNORE_CACHE);
                if (status < 0) {
                        mlog_errno(status);
                        goto bail;