Re: [PATCH 4/6] reiser4: discard: don't be overly smart when gluing extents in discard_sorted_merged_extents().

[Edward Shishkin <edward.shishkin@gmail.com>]

Agreed.
This is absolutely not needed "if".

Thanks!
Edward.


On 12/12/2014 10:10 PM, Ivan Shapovalov wrote:
> @tailp, @alen and @end must be updated simultaneously because there are expressions
> involving combinations of these variables.
>
> Signed-off-by: Ivan Shapovalov <intelfx100@gmail.com>
> ---
>   fs/reiser4/discard.c | 12 ++----------
>   1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/fs/reiser4/discard.c b/fs/reiser4/discard.c
> index a8c5336..86ff6e4 100644
> --- a/fs/reiser4/discard.c
> +++ b/fs/reiser4/discard.c
> @@ -366,18 +366,10 @@ static int discard_sorted_merged_extents(struct list_head *head)
>   					/*
>   					 * jump to the glued extent
>   					 */
> -					if (end + tailp < next_start + next_len) {
> -						/*
> -						 * the glued extent doesn't
> -						 * fit into the tail padding,
> -						 * so update the last one
> -						 */
> -						tailp = extent_get_tailp(next_start + next_len,
> -									 d_off, d_uni);
> -						alen += (next_start + next_len - end);
> -					}
>   					pos = next;
> +					alen += (next_start + next_len - end);
>   					end = next_start + next_len;
> +					tailp = extent_get_tailp(end, d_off, d_uni);
>   					/*
>   					 * try to glue more extents
>   					 */