Received-SPF: pass (google.com: domain of linux-kernel+bounces-162801-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: John Garry <john.g.garry@oracle.com>
To: david@fromorbit.com, djwong@kernel.org, hch@lst.de,
        viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz,
        chandan.babu@oracle.com, willy@infradead.org
Cc: axboe@kernel.dk, martin.petersen@oracle.com, linux-kernel@vger.kernel.org,
        linux-fsdevel@vger.kernel.org, tytso@mit.edu, jbongio@google.com,
        ojaswin@linux.ibm.com, ritesh.list@gmail.com, mcgrof@kernel.org,
        p.raghav@samsung.com, linux-xfs@vger.kernel.org,
        catherine.hoang@oracle.com, John Garry <john.g.garry@oracle.com>
Subject: [PATCH RFC v3 12/21] xfs: Only free full extents for forcealign
Date: Mon, 29 Apr 2024 17:47:37 +0000
Message-Id: <20240429174746.2132161-13-john.g.garry@oracle.com>
In-Reply-To: <20240429174746.2132161-1-john.g.garry@oracle.com>
References: <20240429174746.2132161-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?UP3KRZPJfLY9H8J3XhlSS/jBiZkb9xIznhOTDUQyzXdD6RtW1fYUN59cBlnk?=
 =?us-ascii?Q?Z3aPJzw43L3Fu32SMBxVUZS+Kn0OPzOfbMz0ONR4Uvq0jiJ3ne6asz5OiuSm?=
 =?us-ascii?Q?LJvdnHFE0kfZWLLplBahLHtSDjtP+Mw+YRbg5z5njP+i5BiIWJWrKcGFKk8K?=
 =?us-ascii?Q?BOtR7OZfCmK90nH0mKkPEXek6Y6K8R2sm0qEACBZD5y83NY3+C3SPPvzCSHD?=
 =?us-ascii?Q?gsucCRMw3Z4w2PrGMYWRoKvUVP5uiPDYshovorIKMyH2y3DkamxBVRetF/wc?=
 =?us-ascii?Q?YrSNiXc8Xuzg7bKUTGUhFFB8KSTaK7NArn9YeQ11m+09L3auW5zNNeV10/G1?=
 =?us-ascii?Q?bJZyuILVt/sILkTyCnUsn8PA73wCbzB6b+U0XBhpk/zDrKsRGYvnybGQ9zs2?=
 =?us-ascii?Q?b4Z+Xr0Q28RFANdAAOHX5HkLIfCBZk3hzF1k5FWlfPITy+scLa6SRLFb1yt+?=
 =?us-ascii?Q?gyOWl3KElnG2H96+xR/EIKbsCCcURBWXeoAoDrloxIag5oAb0GjVDz3sKm5L?=
 =?us-ascii?Q?zstukkQQJd7aqhhpZLG37HJbvZWOT/2IeWl5LN1hEAb/NdsNQejoUEcrSigg?=
 =?us-ascii?Q?4HnLzFJZsI1df46urI5dbSHdqpJBTwoJnvOG2qPgw1TnX2kkSsdmW2tpVUSK?=
 =?us-ascii?Q?My5LxSaxi5p0z54yBAhydY/wNw4Ike8I/RDDE0zJrhUb4R2NaIgQ+0ztjo8a?=
 =?us-ascii?Q?l4uVEsrRvJhVLYaThAkAZYfARwvimtZFuwPB6uLXaJDytuor6To8aGWQTrQ4?=
 =?us-ascii?Q?FkdwYeEH6PDPdi7W2amb0JfrhumnU8Y8A6twB9RUnlmcAz5v7PI5gAxXGO+c?=
 =?us-ascii?Q?LAhdxd0ptc3dDE254m5TY6tMyUyJ5mjRTwzOBWLXv5R99uevHFxHBvxVXR9e?=
 =?us-ascii?Q?driGZf7Yn6v8kAx+bUenHL41iIOebxPmDhsvgVdPMpnQ15tWp8eC2cQXKfSU?=
 =?us-ascii?Q?IamwG+v/NbIgQRlXgpLxoF/oWs9yoV4o6K9XkmzGcH7Q+X+lPnHUguIwZcPY?=
 =?us-ascii?Q?iu+Tsl1kDncwpoae6pRUV07OMTCH0KOM6t28C6KHSiWviJCeK/cbnkDjCBtG?=
 =?us-ascii?Q?tYA1+kMZ9Ia1dyq1CF4y5VXPMogwlBu6BSGrYT6a0gUbLEnoRac+jwKdcFkf?=
 =?us-ascii?Q?PRHhrGEnFx3MI6LZeTeBc9+ZocdGGx8Cr86r+YddmeyZcZlGhJyTP1RDqHGq?=
 =?us-ascii?Q?N46fFQDt7u9D/v12U+EvKKbf9aj4rzCrZ5RRk2a65D/GDg/FhjT44eiU4e5Z?=
 =?us-ascii?Q?v2eCT5c8qODkUeyeKUybcgd9IPINjIfMizoqO8SDT4jijb7J5Q3ljBcpEnUF?=
 =?us-ascii?Q?mG44Zv7iIrhKMNPn0QUDc+A/pEjq6KI5N+YiyitoulzfKBH8wzhagxA9kyWb?=
 =?us-ascii?Q?QcgqScPGs1Q6ytddmQ07RMzmTHDuzZ04N/WBX0NC4mZ5SHYBDLkgpRvFMyiM?=
 =?us-ascii?Q?JuieBcQpuhyFxhDA96VG3f69HSiCujPwxMdPJLozbFC37FJevWJ1dCJstEqf?=
 =?us-ascii?Q?3z0Adit3hLsQpvIKJDyYJHDoUpHHMqAiHRyD6VGCOdrmPBZQzof4AUjK7yXO?=
 =?us-ascii?Q?JzkvxAwCUTVbdWFTa4rBEhgazFK4KIWTT5ivygKhIe+5R9nnrDTiZITh2AEn?=
 =?us-ascii?Q?0A=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	xSxwIh9YK3mFtWbxtdTqu/brVDSEvDxUTU0fZRrjT+VGWbbpuRyKEpGX7oCoVZUqC9DoRri3zFGIzihRAcCHh4hnc0W5PrpN2C/0OtsSwqLFgrU8OXPDaY59qu5i/0eyEvTMMJCqaxotwaG8eawN7DJm+kecV/1EXCV4uNgs0VUn4OU8BIwm/5/8hmemI3an9+qBeKfTfmeu6GB+7dBYAjDE2zLFtylpo0jcLgznhhfGeY7ubhyFtVvd+KDOL1X9TMbVAN9Plnt4CNq6H7tED7qm/n3mYq3fhd3aEHVDF2BOveV7HUWZwPmxwuLe6FIkynx4mCxeqOVekBfyBxVKYOTC562fz/E1vGV49+7zeW+dRMrs8A7gpLcpRKwWga7kDNaCuaVq0NQR5duhYFXe6Rp0L+6eYb5Dvd28ZbyXhr1dzAf/3dVWB/hw+OZwDSbzai++UPYNi38mvKzupvMHPNWKmzQO9UNiuqRU68mkablfZ5iEXHlgzyKyMk2q98vQM7JuBbk8pp9kF7jNk1KQ3NQFQo6atlcICKW3fjpwzWVTUACCiP/jNWgnyzOQTuxtMg4fzxZ1QP4CwaLkjTGQ/CeRIsx0/vtxKG2ImcUXHyU=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1a16b780-9eff-40c4-bd3a-08dc68749577
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 17:48:31.4206
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: casGE9bpcE9Gp7Ptcs7713NE1YykhwxthcxUs3JbnvQeynd2nj96Ki4YgCYL0KX726dUVAM4G9N7ce2JXQ9kpw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6389
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26
 definitions=2024-04-29_15,2024-04-29_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0
 phishscore=0 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2404010000 definitions=main-2404290115
X-Proofpoint-ORIG-GUID: UADoqFf8zx7YVw6YBSeZQm5wU0rBvb4p
X-Proofpoint-GUID: UADoqFf8zx7YVw6YBSeZQm5wU0rBvb4p

Like we already do for rtvol, only free full extents for forcealign in
xfs_free_file_space().

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 fs/xfs/xfs_bmap_util.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index f26d1570b9bd..1dd45dfb2811 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -847,8 +847,11 @@ xfs_free_file_space(
 	startoffset_fsb = XFS_B_TO_FSB(mp, offset);
 	endoffset_fsb = XFS_B_TO_FSBT(mp, offset + len);
 
-	/* We can only free complete realtime extents. */
-	if (XFS_IS_REALTIME_INODE(ip) && mp->m_sb.sb_rextsize > 1) {
+	/* Free only complete extents. */
+	if (xfs_inode_has_forcealign(ip) && ip->i_extsize > 1) {
+		startoffset_fsb = roundup_64(startoffset_fsb, ip->i_extsize);
+		endoffset_fsb = rounddown_64(endoffset_fsb, ip->i_extsize);
+	} else if (XFS_IS_REALTIME_INODE(ip) && mp->m_sb.sb_rextsize > 1) {
 		startoffset_fsb = xfs_rtb_roundup_rtx(mp, startoffset_fsb);
 		endoffset_fsb = xfs_rtb_rounddown_rtx(mp, endoffset_fsb);
 	}
-- 
2.31.1