On Tue 13-05-25 17:03:25, Max Kellermann wrote: > Allows killing processes that are waiting for the inode lock. > > Signed-off-by: Max Kellermann <max.kellermann@xxxxxxxxx> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@xxxxxxx> Honza > --- > v2: split into separate patches > > This part was reviewed by Christian Brauner here: > https://lore.kernel.org/linux-fsdevel/20250512-unrat-kapital-2122d3777c5d@brauner/ > > Signed-off-by: Max Kellermann <max.kellermann@xxxxxxxxx> > --- > fs/open.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/fs/open.c b/fs/open.c > index a9063cca9911..d2f2df52c458 100644 > --- a/fs/open.c > +++ b/fs/open.c > @@ -635,7 +635,9 @@ int chmod_common(const struct path *path, umode_t mode) > if (error) > return error; > retry_deleg: > - inode_lock(inode); > + error = inode_lock_killable(inode); > + if (error) > + goto out_mnt_unlock; > error = security_path_chmod(path, mode); > if (error) > goto out_unlock; > @@ -650,6 +652,7 @@ int chmod_common(const struct path *path, umode_t mode) > if (!error) > goto retry_deleg; > } > +out_mnt_unlock: > mnt_drop_write(path->mnt); > return error; > } > @@ -769,7 +772,9 @@ int chown_common(const struct path *path, uid_t user, gid_t group) > return -EINVAL; > if ((group != (gid_t)-1) && !setattr_vfsgid(&newattrs, gid)) > return -EINVAL; > - inode_lock(inode); > + error = inode_lock_killable(inode); > + if (error) > + return error; > if (!S_ISDIR(inode->i_mode)) > newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_PRIV | > setattr_should_drop_sgid(idmap, inode); > -- > 2.47.2 > -- Jan Kara <jack@xxxxxxxx> SUSE Labs, CR
