Commit 38dc8889 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: consolidate the error handling in run_delalloc_nocow 



Share the calls to extent_clear_unlock_delalloc for btrfs_path allocation
failure handling and the normal exit path.

This relies on btrfs_free_path ignoring a NULL pointer, and the
initialization of cur_offset to start at the beginning of the function.

Reviewed-by: default avatarBoris Burkov <boris@bur.io>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 18f62b86

fs/btrfs/inode.c

+2 −7
Original line number Diff line number Diff line
@@ -1978,13 +1978,8 @@ static noinline int run_delalloc_nocow(struct btrfs_inode *inode, 


	path = btrfs_alloc_path();

	if (!path) {

		extent_clear_unlock_delalloc(inode, start, end, locked_page,

					     EXTENT_LOCKED | EXTENT_DELALLOC |

					     EXTENT_DO_ACCOUNTING |

					     EXTENT_DEFRAG, PAGE_UNLOCK |

					     PAGE_START_WRITEBACK |

					     PAGE_END_WRITEBACK);

		return -ENOMEM;

		ret = -ENOMEM;

		goto error;

	}



	nocow_args.end = end;