From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D164846F for ; Wed, 5 Feb 2025 20:23:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738786984; cv=none; b=t8WUz9RjaKqxJ+KttO1um1UWFYfy0hQ01bxYaDrDWR8p9Uon2Uw+6kPy9SmnFsW4cJ5q/dRGOPyzhNoLGrVJnafTdDePmowXjiNlRA/fP9rqdobaM/nvcU/fdUArizuv8LLRSd1tYAQM+ulaNo3tFCaYvgyz/xn6G378806yMPo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738786984; c=relaxed/simple; bh=s08+laRbt4tGUaqo0bdSrKIz3v1o6Zw0T9CxiWjBXgc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=RR5c18dEyVuIy2L23qstI+wGtwBkGB+PT8V4UQnbgNevTm/86baV51xEUEW/SiLDa99G6Dr3MvwPndrnD69lDLJbulPUPHc8wGLccEnjUqCYb4p+wBlRW/fRazM55q777iC69M1nXYGfqJLIyqCZmKt+KWsv1w2gPhL1v2GKwqY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gVVTXyFY; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gVVTXyFY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738786982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=hX1ETsk+/ojkDlrb+TeOSZXHsaBrsfJvcStDsHObzSQ=; b=gVVTXyFYVXyswJ6saBV+cgec5iEYNxIjWuVy88V223Jf4P3ITP4/70TbGRaQWpn4YEJBiV 3HqdM2UbP5WgJT0eHcUXAH0lO5Oj9PXcnJFJwZDsCgabPfOff4RtwQMVVf0HEdh5/pME8J 8LHHXjGtmyCqPEiGqT2n9IkAfynNt+c= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-651-nrxq096yNOm4Qps8uZD50A-1; Wed, 05 Feb 2025 15:23:00 -0500 X-MC-Unique: nrxq096yNOm4Qps8uZD50A-1 X-Mimecast-MFC-AGG-ID: nrxq096yNOm4Qps8uZD50A Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1AFFD1955D82; Wed, 5 Feb 2025 20:22:58 +0000 (UTC) Received: from bfoster (unknown [10.22.88.48]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 256ED180087A; Wed, 5 Feb 2025 20:22:57 +0000 (UTC) Date: Wed, 5 Feb 2025 15:25:20 -0500 From: Brian Foster To: "Darrick J. Wong" Cc: linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, Christoph Hellwig Subject: Re: [PATCH v5 06/10] iomap: export iomap_iter_advance() and return remaining length Message-ID: References: <20250205135821.178256-1-bfoster@redhat.com> <20250205135821.178256-7-bfoster@redhat.com> <20250205185801.GO21808@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250205185801.GO21808@frogsfrogsfrogs> X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 On Wed, Feb 05, 2025 at 10:58:01AM -0800, Darrick J. Wong wrote: > On Wed, Feb 05, 2025 at 08:58:17AM -0500, Brian Foster wrote: > > As a final step for generic iter advance, export the helper and > > update it to return the remaining length of the current iteration > > after the advance. This will usually be 0 in the iomap_iter() case, > > but will be useful for the various operations that iterate on their > > own and will be updated to advance as they progress. > > > > Signed-off-by: Brian Foster > > Reviewed-by: Christoph Hellwig > > --- > > fs/iomap/iter.c | 22 ++++++++-------------- > > include/linux/iomap.h | 1 + > > 2 files changed, 9 insertions(+), 14 deletions(-) > > > > diff --git a/fs/iomap/iter.c b/fs/iomap/iter.c > > index 8e0746ad80bd..cdba24dbbfd7 100644 > > --- a/fs/iomap/iter.c > > +++ b/fs/iomap/iter.c > > @@ -15,22 +15,16 @@ static inline void iomap_iter_reset_iomap(struct iomap_iter *iter) > > } > > > > /* > > - * Advance to the next range we need to map. > > - * > > - * If the iomap is marked IOMAP_F_STALE, it means the existing map was not fully > > - * processed - it was aborted because the extent the iomap spanned may have been > > - * changed during the operation. In this case, the iteration behaviour is to > > - * remap the unprocessed range of the iter, and that means we may need to remap > > - * even when we've made no progress (i.e. count = 0). Hence the "finished > > - * iterating" case needs to distinguish between (count = 0) meaning we are done > > - * and (count = 0 && stale) meaning we need to remap the entire remaining range. > > + * Advance the current iterator position and return the length remaining for the > > + * current mapping. > > This last sentence should state that the remaining length is returned > via @count as an outparam and not through the function's return value. > Ok. Brian > Otherwise looks ok to me. > > --D > > > */ > > -static inline int iomap_iter_advance(struct iomap_iter *iter, s64 count) > > +int iomap_iter_advance(struct iomap_iter *iter, u64 *count) > > { > > - if (WARN_ON_ONCE(count > iomap_length(iter))) > > + if (WARN_ON_ONCE(*count > iomap_length(iter))) > > return -EIO; > > - iter->pos += count; > > - iter->len -= count; > > + iter->pos += *count; > > + iter->len -= *count; > > + *count = iomap_length(iter); > > return 0; > > } > > > > @@ -93,7 +87,7 @@ int iomap_iter(struct iomap_iter *iter, const struct iomap_ops *ops) > > * advanced at all (i.e. no work was done for some reason) unless the > > * mapping has been marked stale and needs to be reprocessed. > > */ > > - ret = iomap_iter_advance(iter, processed); > > + ret = iomap_iter_advance(iter, &processed); > > if (!ret && iter->len > 0) > > ret = 1; > > if (ret > 0 && !iter->processed && !stale) > > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > > index f5ca71ac2fa2..f304c602e5fe 100644 > > --- a/include/linux/iomap.h > > +++ b/include/linux/iomap.h > > @@ -229,6 +229,7 @@ struct iomap_iter { > > }; > > > > int iomap_iter(struct iomap_iter *iter, const struct iomap_ops *ops); > > +int iomap_iter_advance(struct iomap_iter *iter, u64 *count); > > > > /** > > * iomap_length_trim - trimmed length of the current iomap iteration > > -- > > 2.48.1 > > > > >