From nobody Thu Dec 18 08:38:59 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1ABD938F9C for ; Wed, 10 Dec 2025 01:51:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765331472; cv=none; b=mHIAbDHPbgjDXH/022owzbQABG94E5rssRlIC4K0tfSAI2thCpSF5yIVk1qRF91KeWy9aR42vMDWLz1k/qGgSKLv7GgFYbGeAI345MfYnjHCwnT19XwDGDdewGmgsuaZgyVzhT6FhqBNanURCmYq80smnNGOzy4nXoNo1SLi7HE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765331472; c=relaxed/simple; bh=rIjBSk8W9vHLkEVzp7rPU63DurUszuJ0brbQFnUC4kE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ceh/rTgBmoNKFM38nlDNx1XZPkafxey3Lnu1/vjQJJD9CUb9pmaIhEtxtVc8jxJBkRhzstM6JC4D+F1thPgB2F45zCsbr+KdZmsVS0FgsKh5z5RnJ8nPky9EKyZZD2hx5t9Ldai8kAkmU8iPMs01ixESd72mmTWZZuw8Tw8zD/o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=VgeJTicg; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="VgeJTicg" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4779cd413b4so4483755e9.2 for ; Tue, 09 Dec 2025 17:51:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1765331468; x=1765936268; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vqN1NKbSsmoO7F1QrFMDpSGOC06IfLpd/c1+vjKbvBI=; b=VgeJTicg8bG7wjhCDs+6cWgfWIT2rUxjzRGPcRGjrUDb3O84suGtyuXScXYRJvpwjh zrnOFznhGRZbsPLr7vauQIhdx9xU00upC9B9FwCY4a46Udw+GrZ2zXThF/CaOk2y/ypn r0P9qt7JI5LoIdYFjZsbeIxmYaSbH3BAA0xYXE+gogJSn9xjv13q45yfceVKPjSTw/sG GF/v38Cw3E1XFkKxs8PG8xAg9NcL3hL3OEyPyCzY38HmO+rbn6LxBvHPlWcRsNDNUDAf PAG1NS68J3m0MkrmMLEkL6Nw4U5VrrIUT4Pif6JXIEqJVJ3HtlsYrBi72/cmepP/IHKG t5FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765331468; x=1765936268; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vqN1NKbSsmoO7F1QrFMDpSGOC06IfLpd/c1+vjKbvBI=; b=Hdhcy58J81IOVQ6vnSOVN57rnVDHAa5AaTKPkVgKDAi7L6ZIRN3/Ve7Ti0/J6KmoVU tdm4O3gas9tXzMTq2e1aVW/juxU9tLyoVOd/08tMQMhFeCLJR5V/R7lYIc8v+R+oj9K9 9Y8kraoNL1ljMVEIqwIHpCmihDcngtFGYa2VktYTAzs71py0RWJqpIVQ1PUiGQghadw0 Y28Xv7IdZjQISMFIpX/D7O6cqD1FALEmbrWJh5EtJR8quFmRlZmrkkE4EdF+YVKalPRO CFCVsMPLxZ6oXs12RArNShr8sepuG7u/cZwF1gfaDoPLnbWu5SddTAf9+cbCITyDajZ7 X+Ow== X-Forwarded-Encrypted: i=1; AJvYcCVLfX2B67tUdghhkNPhYox5vdGxQdeESWTzyLKTY40DIEdgrdYMyPtEsZSD0es4eR0RhLN5pPq4/PvDVb0=@vger.kernel.org X-Gm-Message-State: AOJu0YxCT3OO5vn5ha1Q06lPKdl1tfwP5459cJPBd59wRrZLC/a3ALTp BtrFsvv7Yl6/6HTUfvqn++NL5l7A1Apz6kOCyBCFF8FvOK+NeEyv1ztm7eLWL16Ywb4= X-Gm-Gg: ASbGnctnP2j5ISE9QLB5eM+q9wk/llGR73p5aPs+KHnjFcobPAzmuNSoGwd8NglxyNk MEwsBEzg05PchNDRhDKOMVvTbpfB64UTQ+/SnN47Y25jJxKqRuoWdK5pBossoqfU24VBgAREcmE 08oFyUYw8bpRDahrMJbFLWlcB13W59zCYvgMF/KwqkqnEoIzSC4S7lHTI1MkheH/uGnYWR/1hQ2 5Zau/8kkUcJ2gBI6UgcZKws1PqpuhImVj/A56J1qA/ZnZYLz6520W221kR0qfW9JDWv2xsgwARF 86cP2gobNV1oC+H4WBg3ZdwLHw8GfHeDnuZW+sL8AwZW4Jh8VRHFlDKurjDSm/2kAjUSgvzvE/0 GiLF23voq4YrQ/XciwsZSKHfyFOvy/H5T0HUfLha13VdqBA3GMcP40wEB2avKpXSnmQ6OmzEQeh gPAlu/oEJZr/9owSs5iTQP9ZKF X-Google-Smtp-Source: AGHT+IF3Hyj99KVYH7eKgsob3BQ45Jd/nJmyOnYqu0haD+sew52kZzas8xvaY4Ad9Sm9iGclBL4nXw== X-Received: by 2002:a05:600c:1992:b0:45f:2c33:2731 with SMTP id 5b1f17b1804b1-47a83794790mr3584915e9.2.1765331468395; Tue, 09 Dec 2025 17:51:08 -0800 (PST) Received: from localhost.localdomain ([202.127.77.110]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bf748c6bcacsm15706689a12.0.2025.12.09.17.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Dec 2025 17:51:07 -0800 (PST) From: Heming Zhao To: joseph.qi@linux.alibaba.com, mark@fasheh.com, jlbec@evilplan.org Cc: Heming Zhao , ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/1] ocfs2: fix reflink preserve cleanup issue Date: Wed, 10 Dec 2025 09:50:48 +0800 Message-ID: <20251210015058.8327-2-heming.zhao@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251210015058.8327-1-heming.zhao@suse.com> References: <20251210015058.8327-1-heming.zhao@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" commit c06c303832ec ("ocfs2: fix xattr array entry __counted_by error") doesn't handle all cases and the cleanup job for preserved xattr entries still has bug: - the 'last' pointer should be shifted by one unit after cleanup an array entry. - current code logic doesn't cleanup the first entry when xh_count is 1. Note, commit c06c303832ec is also a bug fix for 0fe9b66c65f3. Fixes: 0fe9b66c65f3 ("ocfs2: Add preserve to reflink.") Signed-off-by: Heming Zhao --- fs/ocfs2/xattr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index dc1761e84814..31d023f9e2ed 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -6364,6 +6364,10 @@ static int ocfs2_reflink_xattr_header(handle_t *hand= le, (void *)last - (void *)xe); memset(last, 0, sizeof(struct ocfs2_xattr_entry)); + last =3D &new_xh->xh_entries[le16_to_cpu(new_xh->xh_count)] - 1; + } else { + memset(xe, 0, sizeof(struct ocfs2_xattr_entry)); + last =3D NULL; } =20 /* --=20 2.43.0