diff mbox series

libmultipath: fix dev_loss_tmo even if not set in configuration

Message ID 20230630155510.22843-1-mwilck@suse.com (mailing list archive)
State Not Applicable, archived
Delegated to: christophe varoqui
Headers show
Series libmultipath: fix dev_loss_tmo even if not set in configuration | expand

Commit Message

Martin Wilck June 30, 2023, 3:55 p.m. UTC
From: Martin Wilck <mwilck@suse.com>

If pp->dev_loss_tmo == DEV_LOSS_TMO_UNSET, sysfs_set_scsi_tmo() would
not set it to min_dev_loss_tmo, causing the system dev_loss_tmo value
(by default, 30s) to remain unchanged. Fix it.

Fixes: 6ad77db ("libmultipath: Set the scsi timeout parameters by path")
Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 libmultipath/discovery.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Benjamin Marzinski June 30, 2023, 5 p.m. UTC | #1
On Fri, Jun 30, 2023 at 05:55:10PM +0200, mwilck@suse.com wrote:
> From: Martin Wilck <mwilck@suse.com>
> 
> If pp->dev_loss_tmo == DEV_LOSS_TMO_UNSET, sysfs_set_scsi_tmo() would
> not set it to min_dev_loss_tmo, causing the system dev_loss_tmo value
> (by default, 30s) to remain unchanged. Fix it.
> 
> Fixes: 6ad77db ("libmultipath: Set the scsi timeout parameters by path")
> Signed-off-by: Martin Wilck <mwilck@suse.com>
> ---
>  libmultipath/discovery.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
> index 2dcafe5..285cbd6 100644
> --- a/libmultipath/discovery.c
> +++ b/libmultipath/discovery.c
> @@ -895,9 +895,8 @@ sysfs_set_scsi_tmo (struct config *conf, struct multipath *mpp)
>  			continue;
>  		}
>  
> -		if (pp->dev_loss != DEV_LOSS_TMO_UNSET &&
> -		    pp->dev_loss < min_dev_loss) {
> -			warn_dev_loss = true;
> +		if (pp->dev_loss < min_dev_loss) {
> +			warn_dev_loss = (pp->dev_loss != DEV_LOSS_TMO_UNSET);
>  			pp->dev_loss = min_dev_loss;
>  		}
>  		if (pp->dev_loss != DEV_LOSS_TMO_UNSET &&

Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>

> -- 
> 2.41.0
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
diff mbox series

Patch

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 2dcafe5..285cbd6 100644
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -895,9 +895,8 @@  sysfs_set_scsi_tmo (struct config *conf, struct multipath *mpp)
 			continue;
 		}
 
-		if (pp->dev_loss != DEV_LOSS_TMO_UNSET &&
-		    pp->dev_loss < min_dev_loss) {
-			warn_dev_loss = true;
+		if (pp->dev_loss < min_dev_loss) {
+			warn_dev_loss = (pp->dev_loss != DEV_LOSS_TMO_UNSET);
 			pp->dev_loss = min_dev_loss;
 		}
 		if (pp->dev_loss != DEV_LOSS_TMO_UNSET &&