Merge tag 'v5.10-rc1' into kvmarm-master/next

[linux-2.6-microblaze.git] / fs / ext4 / indirect.c

diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index 23e504a..05efa68 100644 (file)
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -163,7 +163,7 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth,
                }
 
                if (!bh_uptodate_or_lock(bh)) {
-                       if (bh_submit_read(bh) < 0) {
+                       if (ext4_read_bh(bh, 0, NULL) < 0) {
                                put_bh(bh);
                                goto failure;
                        }
@@ -1013,14 +1013,14 @@ static void ext4_free_branches(handle_t *handle, struct inode *inode,
                        }
 
                        /* Go read the buffer for the next level down */
-                       bh = sb_bread(inode->i_sb, nr);
+                       bh = ext4_sb_bread(inode->i_sb, nr, 0);
 
                        /*
                         * A read failure? Report error and clear slot
                         * (should be rare).
                         */
-                       if (!bh) {
-                               ext4_error_inode_block(inode, nr, EIO,
+                       if (IS_ERR(bh)) {
+                               ext4_error_inode_block(inode, nr, -PTR_ERR(bh),
                                                       "Read failure");
                                continue;
                        }