diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-12-31 21:04:41 +0300 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-01-18 00:24:54 +0300 |
| commit | adde81cfd5a8d4966f5805e030ab3d0a7825b118 (patch) | |
| tree | a719da367e627e160d19c52ac5f3fd6d72e82f49 /fs/ext4 | |
| parent | 43f816772ff3b4adc5cef24c78916bfbc8fee57f (diff) | |
| download | linux-adde81cfd5a8d4966f5805e030ab3d0a7825b118.tar.xz | |
ext4: fix documentation for ext4_ext_try_to_merge()
Don't mention the nonexistent return value, and mention both types of
merges that are attempted.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20191231180444.46586-6-ebiggers@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/extents.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index bae409aad53e..6e4d8a5cb7fb 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -1828,13 +1828,14 @@ static void ext4_ext_try_to_merge_up(handle_t *handle, } /* - * This function tries to merge the @ex extent to neighbours in the tree. - * return 1 if merge left else 0. + * This function tries to merge the @ex extent to neighbours in the tree, then + * tries to collapse the extent tree into the inode. */ static void ext4_ext_try_to_merge(handle_t *handle, struct inode *inode, struct ext4_ext_path *path, - struct ext4_extent *ex) { + struct ext4_extent *ex) +{ struct ext4_extent_header *eh; unsigned int depth; int merge_done = 0; |