mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 11:55:44 +03:00
automount: handle expire_tokens when the mount unit changes its state (#3434)
This basically reverts 7b2fd9d512
("core:
remove duplicate code in automount_update_mount()").
This was not duplicate code. The expire_tokens need to be handled as well:
Send 0 == success for MOUNT_DEAD (umount successful), do nothing for
MOUNT_UNMOUNTING (not yet done) and an error for everything else.
Otherwise the automount logic will assume unmounting is not done and will
not send any new requests for mounting. As a result, the corresponding
mount unit is never mounted.
Without this, automounts with TimeoutIdleSec= are broken. Once the idle
timeout triggered a umount, any access to the corresponding filesystem
hangs forever.
Fixes #3332.
This commit is contained in:
parent
592705f2f7
commit
0a62f81045
@ -502,6 +502,20 @@ static void automount_trigger_notify(Unit *u, Unit *other) {
|
||||
automount_set_state(a, AUTOMOUNT_RUNNING);
|
||||
}
|
||||
|
||||
if (IN_SET(MOUNT(other)->state,
|
||||
MOUNT_MOUNTING, MOUNT_MOUNTING_DONE,
|
||||
MOUNT_MOUNTED, MOUNT_REMOUNTING,
|
||||
MOUNT_MOUNTING_SIGTERM, MOUNT_MOUNTING_SIGKILL,
|
||||
MOUNT_REMOUNTING_SIGTERM, MOUNT_REMOUNTING_SIGKILL,
|
||||
MOUNT_UNMOUNTING_SIGTERM, MOUNT_UNMOUNTING_SIGKILL,
|
||||
MOUNT_FAILED)) {
|
||||
|
||||
(void) automount_send_ready(a, a->expire_tokens, -ENODEV);
|
||||
}
|
||||
|
||||
if (MOUNT(other)->state == MOUNT_DEAD)
|
||||
(void) automount_send_ready(a, a->expire_tokens, 0);
|
||||
|
||||
/* The mount is in some unhappy state now, let's unfreeze any waiting clients */
|
||||
if (IN_SET(MOUNT(other)->state,
|
||||
MOUNT_DEAD, MOUNT_UNMOUNTING,
|
||||
|
Loading…
Reference in New Issue
Block a user