2017-12-05 21:59:45

by Ben Hutchings

[permalink] [raw]
Subject: Re: [PATCH 4.4 20/96] autofs: dont fail mount for transient error

On Tue, 2017-11-28 at 11:22 +0100, Greg Kroah-Hartman wrote:
> 4.4-stable review patch.  If anyone has any objections, please let me know.
>
> ------------------
>
> From: NeilBrown <[email protected]>
>
> commit ecc0c469f27765ed1e2b967be0aa17cee1a60b76 upstream.
[...]
> @@ -173,7 +175,18 @@ static void autofs4_notify_daemon(struct
>   mutex_unlock(&sbi->wq_mutex);
>  
>   if (autofs4_write(sbi, pipe, &pkt, pktsz))
> + switch (ret = autofs4_write(sbi, pipe, &pkt, pktsz)) {

I'm pretty sure the if-statement was meant to be replaced by the
switch-statement here. (This is wrong upstream, not an error in
backporting.)

Ben.

> + case 0:
> + break;
> + case -ENOMEM:
> + case -ERESTARTSYS:
> + /* Just fail this one */
> + autofs4_wait_release(sbi, wq->wait_queue_token, ret);
> + break;
> + default:
>   autofs4_catatonic_mode(sbi);
> + break;
> + }
>   fput(pipe);
>  }
>  

--
Ben Hutchings
Software Developer, Codethink Ltd.


2017-12-05 22:22:28

by NeilBrown

[permalink] [raw]
Subject: Re: [PATCH 4.4 20/96] autofs: dont fail mount for transient error

On Tue, Dec 05 2017, Ben Hutchings wrote:

> On Tue, 2017-11-28 at 11:22 +0100, Greg Kroah-Hartman wrote:
>> 4.4-stable review patch.  If anyone has any objections, please let me know.
>>
>> ------------------
>>
>> From: NeilBrown <[email protected]>
>>
>> commit ecc0c469f27765ed1e2b967be0aa17cee1a60b76 upstream.
> [...]
>> @@ -173,7 +175,18 @@ static void autofs4_notify_daemon(struct
>>   mutex_unlock(&sbi->wq_mutex);
>>  
>>   if (autofs4_write(sbi, pipe, &pkt, pktsz))
>> + switch (ret = autofs4_write(sbi, pipe, &pkt, pktsz)) {
>
> I'm pretty sure the if-statement was meant to be replaced by the
> switch-statement here. (This is wrong upstream, not an error in
> backporting.)

Argg yes. Thanks for the review!!!
Fix posted.

Thanks,
NeilBrown

>
> Ben.
>
>> + case 0:
>> + break;
>> + case -ENOMEM:
>> + case -ERESTARTSYS:
>> + /* Just fail this one */
>> + autofs4_wait_release(sbi, wq->wait_queue_token, ret);
>> + break;
>> + default:
>>   autofs4_catatonic_mode(sbi);
>> + break;
>> + }
>>   fput(pipe);
>>  }
>>  
>
> --
> Ben Hutchings
> Software Developer, Codethink Ltd.


Attachments:
signature.asc (832.00 B)