From: Max Kellermann <max.kellermann@ionos.com>
Date: Tue, 13 May 2025 15:03:26 +0000 (+0200)
Subject: fs/open: make do_truncate() killable
X-Git-Tag: v6.16-rc1~223^2~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d68687564280b09d80e7cf8ce20bb71880586d3a;p=thirdparty%2Flinux.git

fs/open: make do_truncate() killable

Allows killing processes that are waiting for the inode lock.

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
Link: https://lore.kernel.org/20250513150327.1373061-3-max.kellermann@ionos.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
---

diff --git a/fs/open.c b/fs/open.c
index d2f2df52c458d..7828234a7caa4 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -60,7 +60,10 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry,
 	if (ret)
 		newattrs.ia_valid |= ret | ATTR_FORCE;
 
-	inode_lock(dentry->d_inode);
+	ret = inode_lock_killable(dentry->d_inode);
+	if (ret)
+		return ret;
+
 	/* Note any delegations or leases have already been broken: */
 	ret = notify_change(idmap, dentry, &newattrs, NULL);
 	inode_unlock(dentry->d_inode);