Commit 98bd5c54 authored by David Sterba's avatar David Sterba Committed by Chris Mason

btrfs: sync ioctl, handle errors after transaction start

The version merged to 3.19 did not handle errors from start_trancaction
and could pass an invalid pointer to commit_transaction.

Fixes: 6b5fe46d ("btrfs: do commit in sync_fs if there are pending changes")
Reported-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 6f896054
...@@ -1001,9 +1001,9 @@ int btrfs_sync_fs(struct super_block *sb, int wait) ...@@ -1001,9 +1001,9 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
if (fs_info->pending_changes == 0) if (fs_info->pending_changes == 0)
return 0; return 0;
trans = btrfs_start_transaction(root, 0); trans = btrfs_start_transaction(root, 0);
} else {
return PTR_ERR(trans);
} }
if (IS_ERR(trans))
return PTR_ERR(trans);
} }
return btrfs_commit_transaction(trans, root); return btrfs_commit_transaction(trans, root);
} }
......
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