Commit 3cc79b79 authored by Markus Elfring's avatar Markus Elfring Committed by Linus Torvalds
Browse files

ocfs2: less function calls in ocfs2_convert_inline_data_to_extents() after error detection

kfree() was called in a few cases by ocfs2_convert_inline_data_to_extents()
during error handling even if the passed variable "pages" contained a
null pointer.

* Return from this implementation directly after failure detection for
  the function call "kcalloc".

* Corresponding details could be improved by the introduction of another
  jump label.
Signed-off-by: default avatarMarkus Elfring <>
Cc: Mark Fasheh <>
Cc: Joel Becker <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent fd90d4df
......@@ -6853,13 +6853,13 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
if (pages == NULL) {
ret = -ENOMEM;
goto out;
return ret;
ret = ocfs2_reserve_clusters(osb, 1, &data_ac);
if (ret) {
goto out;
goto free_pages;
......@@ -6991,6 +6991,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
if (data_ac)
return ret;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment