|
@@ -92,17 +92,16 @@ static void ext4_idx_store_pblock(struct ext4_extent_idx *ix, ext4_fsblk_t pb)
|
|
ix->ei_leaf_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);
|
|
ix->ei_leaf_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);
|
|
}
|
|
}
|
|
|
|
|
|
-static handle_t *ext4_ext_journal_restart(handle_t *handle, int needed)
|
|
|
|
|
|
+static int ext4_ext_journal_restart(handle_t *handle, int needed)
|
|
{
|
|
{
|
|
int err;
|
|
int err;
|
|
|
|
|
|
if (handle->h_buffer_credits > needed)
|
|
if (handle->h_buffer_credits > needed)
|
|
- return handle;
|
|
|
|
- if (!ext4_journal_extend(handle, needed))
|
|
|
|
- return handle;
|
|
|
|
- err = ext4_journal_restart(handle, needed);
|
|
|
|
-
|
|
|
|
- return handle;
|
|
|
|
|
|
+ return 0;
|
|
|
|
+ err = ext4_journal_extend(handle, needed);
|
|
|
|
+ if (err)
|
|
|
|
+ return err;
|
|
|
|
+ return ext4_journal_restart(handle, needed);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -1888,11 +1887,9 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode,
|
|
credits += 2 * EXT4_QUOTA_TRANS_BLOCKS(inode->i_sb);
|
|
credits += 2 * EXT4_QUOTA_TRANS_BLOCKS(inode->i_sb);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
- handle = ext4_ext_journal_restart(handle, credits);
|
|
|
|
- if (IS_ERR(handle)) {
|
|
|
|
- err = PTR_ERR(handle);
|
|
|
|
|
|
+ err = ext4_ext_journal_restart(handle, credits);
|
|
|
|
+ if (err)
|
|
goto out;
|
|
goto out;
|
|
- }
|
|
|
|
|
|
|
|
err = ext4_ext_get_access(handle, inode, path + depth);
|
|
err = ext4_ext_get_access(handle, inode, path + depth);
|
|
if (err)
|
|
if (err)
|