diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-07-24 17:22:40 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2023-08-21 15:54:47 +0300 |
| commit | 38dc88890de6cae3db5a33ece287e56fc9cc4ce6 (patch) | |
| tree | b8a12a4d1bc3cedca8ed417a84ebb5b57aab5b8c /fs/btrfs/inode.c | |
| parent | 18f62b86c4ea943256f8962ecd0cb013c97b4e0f (diff) | |
| download | linux-38dc88890de6cae3db5a33ece287e56fc9cc4ce6.tar.xz | |
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: Boris Burkov <boris@bur.io>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1fb1e4ac4a8c..8d0dd266dd1b 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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; |