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.133.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 A9EFE372EEA for ; Fri, 19 Jun 2026 14:07:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781878065; cv=none; b=kyzrR5m1aBR0F4FHbVZbdrdGixe6ml3jGzUaUigRyBTQe1l0Qd2VhRvwVdvrovyrqPt7rv2hHtwVVAMdBAbnBeKnOqcY7iG6mv4RGovJDB3b/lrHSqtiN3IlWLNtMm6+I8LfC7sFw0uXfhgK5Qgb+ag3F5TEYfhCEe1UhlR1mIU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781878065; c=relaxed/simple; bh=VUlgKQRtFcYZkgLggj06uMIrCxezEkk58BuS/5a9eCw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FRP0NyWjmQKcliyhj+bgKxEFnD+xKYXhrKN9T+a+u0Cfx7hs4h6lkv5KaxQ8ToLnPbTJujtYasgl8Dkd5CVt37IorMEnnxEUaQp80KagnUn5WXqOMz0udbpa/UcyQ/g279woWrd7Bk5tNrkWShS21iYTkgr/+56Owqyd8EnT3Yg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=L18ILc5c; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="L18ILc5c" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781878062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G/liEajtHx9CYrzJvqnOmvWcXVvucaBQw0Nv7dYml2Q=; b=L18ILc5c8xEUI3LiqHoH4/L6oUWvfoQpveykBxJjiEmMDNqDt6JC6qAhF6Qf2J0X6JMuS8 UCppe+dDQAMjFp795jQs3oU8ndMi+i2dDklAEHlAQmJZGUMVI2GI1HfwwWGVL19l6WeXCK 31Km/x4tY/T+QlbFw0EgzC3vUD3ch00= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-156-CCY_34c_OXm1Mi1y4mu7Eg-1; Fri, 19 Jun 2026 10:07:39 -0400 X-MC-Unique: CCY_34c_OXm1Mi1y4mu7Eg-1 X-Mimecast-MFC-AGG-ID: CCY_34c_OXm1Mi1y4mu7Eg_1781878057 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 84C6E185FBF9; Fri, 19 Jun 2026 14:07:36 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.44.50.44]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 88FFD3000238; Fri, 19 Jun 2026 14:07:32 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Paulo Alcantara , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, ceph-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Matthew Wilcox , Christoph Hellwig , Jens Axboe , Mike Marshall Subject: [PATCH 08/11] scatterlist: Fix offset in folio calc in extract_xarray_to_sg() Date: Fri, 19 Jun 2026 15:06:12 +0100 Message-ID: <20260619140646.2633762-9-dhowells@redhat.com> In-Reply-To: <20260619140646.2633762-1-dhowells@redhat.com> References: <20260619140646.2633762-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: ceph-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Fix the calculation of the offset in the folio being extracted in extract_xarray_to_sg(). Note that in the near future, ITER_XARRAY should be removed. Fixes: f5f82cd18732 ("Move netfs_extract_iter_to_sg() to lib/scatterlist.c") Link: https://sashiko.dev/#/patchset/20260608145432.681865-1-dhowells%40redhat.com Signed-off-by: David Howells cc: Paulo Alcantara cc: Matthew Wilcox cc: Christoph Hellwig cc: Jens Axboe cc: Mike Marshall cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- lib/scatterlist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/scatterlist.c b/lib/scatterlist.c index b7fe91ef35b8..6ea40d2e6247 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -1366,6 +1366,7 @@ static ssize_t extract_xarray_to_sg(struct iov_iter *iter, sg_max--; maxsize -= len; + start += len; ret += len; if (maxsize <= 0 || sg_max == 0) break;