From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (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 191893469FC for ; Wed, 1 Jul 2026 14:20:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782915647; cv=none; b=YHd/fq9JAwBK0c+c2AjWl/wjBsjN7MqjWCjAxcO9E/hmhdMQrQWoPGtky+bRO8baV8SVgHe1DnSW8lqXFyGHnvR60BkHfR6hSAoEdK4xLzyQD3a1TfIjCXCBWN3QvzmEXRYUK418BZOgGd/AzfY5GL4pXU0dOPy9xqDPSDulSuw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782915647; c=relaxed/simple; bh=yc2Hyz7KSu0+lW1gLaiBvQG/wcF0zCCeP501YXvzp7Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TZBSjgW7gI6kgPFxExjHmsT2vh+Zc0eg5BXlTc0Bw1jSakFQkfUXn1YfIe+JMOk6Bm/JOJeof/PaVhSLO0JO60yqv4KXMz1/Xwtufz335fKL4Xn3/KG1XjL+jhn8mEJKU+aryoRsuI+z/4RI5VgtEA9lR6WIdF5H281M3+19VxY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B+95Gfxp; arc=none smtp.client-ip=209.85.215.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B+95Gfxp" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-c9e607d81fcso67700a12.2 for ; Wed, 01 Jul 2026 07:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782915645; x=1783520445; 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:content-type; bh=VAnbx+5aUJivupEEG6uiMWkDGEOXRc8YwNCEsizzxjY=; b=B+95GfxpI75Hayaf7iavht28QvcPoX9NJu9ScGGN5sIAaESEYY/C9/lOzl7GySY5iP zOAbpwpJmbMtD5IwIxq7zQ/sqsUOS6aRTPn9sMVqL4/htkjG4A7NrVEvbUMJAnbVEjBD 9JfFypAYCtFobqGJisnS46No9kWOPYe5JsmsMrxA+acgTiJVm1RfzPcayM3d7xFDdjaj WcezlxfBWDVaIxizcHsiAyNFxWiPn4kyepgy1b3bHuHGNUv722I3/gG0wD3Ha4RDG1/L EkJWsbeaNVlHKVqqYN1HpLhCtfQY0cpvkHURzFANsV+93zYfySzfxVJeBZYAwvz3uatf 4vKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782915645; x=1783520445; 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:content-type; bh=VAnbx+5aUJivupEEG6uiMWkDGEOXRc8YwNCEsizzxjY=; b=DO3hmkZqbir4G/eqyr3cb/DUL/kvp7H0/mOHiG5GYohy2OQ1aIQp2SgCesZgjKB3Ju n5emSuOu2f+KI+C7Ae2iRdP0Ljci9yuN7Dh7p/xfPzJIRq+qg9TOpfRPcpyyql3O36kU qGHevg1zr40Ti9Eem32mE06S2GvdNEM0/EjngB8yINgrDJaJ8k7hE0TE0v30uTRdS3mi Cm2j0Zyln7HGyaqQmFMvXCeT8VXjv4O9nyC+USRYAwqcsWo3/kvxqVKAo4E+uIfvewRO tGihqVn0oL6f5kTP6jpljF1RHuUWtc5pWDFpPq2/clnO1nEjEj67MFH/zVhaHxSOqMRJ 2gLg== X-Forwarded-Encrypted: i=1; AFNElJ9PL/jfFcvtUSW/jf9LDMQnvWLVlouiJam+CW5u4DofNMRTWLEw/vBndc2L2exkjCvx4CXsApU9n1WTLMI=@vger.kernel.org X-Gm-Message-State: AOJu0YxykATDvlL5m1wo20tUsfFROBO5SiJ+UofP2+/vBDbSUh7i5dxX HBklOGYw7mUBTOBB3W3SRvCAbcgHbx+kEdPT1Rct4pemOli9MRjeVRcc X-Gm-Gg: AfdE7cnvjM7H3RCDsgEO7znLeka+DBcg0WkTsebAxXLyKOD5NH5lywKAPnzeMYbReKU e7px1b7KCNAxYTlTJz4wi+KGx03CW2clt3dCjSQKxxia38IyCVuBfbKjpYOMMKOvkPKuSGzAjKi 3EEZxyr9519BYS49hQ5AF6dOS5t/3NFnqQgzHzpt2sFwxKl5xlyBdV33ZvQRXuwReze1YBb5SFy v8sAc+7Uniabz+fNHW7hwcfxg1JGrmZrcN1V3JcFLnZash4eI1i/LP0JTCSZGhVE6L3j7yxCcOr +L8skyF5AeqH6LPVDpHDFtk931jkP0Nfzn93xeXBcNFCUivFzaq6mUcX+iHGC75SbqEAqKdy84H Cr5+4/IhsXCR+eItZ4HWxajVzjy0wLgXFL6O+Dsepm12PiuE64YsjNAZRerH4/6f30syBZEdAEk 9byt0ctjGFJK5S63i9rjb5lzyoWzqNTC2SLirTj/mii+w= X-Received: by 2002:a05:6300:6715:b0:3bf:b0b8:58b5 with SMTP id adf61e73a8af0-3bff422d1d6mr1010582637.36.1782915645158; Wed, 01 Jul 2026 07:20:45 -0700 (PDT) Received: from DESKTOP-DK6PUT8.localdomain ([124.70.231.46]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c9e32ef8e49sm383894a12.19.2026.07.01.07.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 07:20:44 -0700 (PDT) From: yizhang089@gmail.com To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, libaokun@linux.alibaba.com, jack@suse.cz, ojaswin@linux.ibm.com, ritesh.list@gmail.com, yi.zhang@huawei.com, yi.zhang@huaweicloud.com, yizhang089@gmail.com, chengzhihao1@huawei.com, yangerkun@huawei.com Subject: [PATCH 1/6] ext4: move partial block zeroing earlier in ext4_zero_range() Date: Wed, 1 Jul 2026 22:20:04 +0800 Message-ID: <20260701142009.1510104-2-yizhang089@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260701142009.1510104-1-yizhang089@gmail.com> References: <20260701142009.1510104-1-yizhang089@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Zhang Yi In ext4_zero_range(), move the ext4_zero_partial_blocks() call, which handles unaligned edges, into the same branch where the unaligned range is preallocated, immediately after ext4_alloc_file_blocks(). This is safe because there is no dependency between partial block handling and the subsequent full block handling. This change will be used by later patches that handle unaligned FALLOC_FL_WRITE_ZEROES operations, which will need to check the partial zeroed result. Signed-off-by: Zhang Yi --- fs/ext4/extents.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 125f628e738a..27ca641e701b 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4734,10 +4734,16 @@ static long ext4_zero_range(struct file *file, loff_t offset, } flags = EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT; - /* Preallocate the range including the unaligned edges */ + /* + * Preallocate the range including the unaligned edges, and zero + * out partial blocks if they already contain data. + */ if (!IS_ALIGNED(offset | end, blocksize)) { ret = ext4_alloc_file_blocks(file, offset, len, new_size, flags); + if (!ret) + ret = ext4_zero_partial_blocks(inode, offset, len, + &partial_zeroed); if (ret) return ret; } @@ -4770,10 +4776,6 @@ static long ext4_zero_range(struct file *file, loff_t offset, if (IS_ALIGNED(offset | end, blocksize)) return ret; - /* Zero out partial block at the edges of the range */ - ret = ext4_zero_partial_blocks(inode, offset, len, &partial_zeroed); - if (ret) - return ret; if (((file->f_flags & O_SYNC) || IS_SYNC(inode)) && partial_zeroed) { ret = filemap_write_and_wait_range(inode->i_mapping, offset, end - 1); -- 2.53.0