diff mbox

Fix max_retries _show and _store functions

Message ID 20170103175331.8089-1-cmaiolino@redhat.com (mailing list archive)
State Accepted
Headers show

Commit Message

Carlos Maiolino Jan. 3, 2017, 5:53 p.m. UTC 
max_retries _show and _store functions should test against cfg->max_retries,
not cfg->retry_timeout

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
---
 fs/xfs/xfs_sysfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Eric Sandeen Jan. 3, 2017, 6:19 p.m. UTC | #1 
On 1/3/17 11:53 AM, Carlos Maiolino wrote:
> max_retries _show and _store functions should test against cfg->max_retries,
> not cfg->retry_timeout
> 
> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>

Whoever made those mistakes should be very ashamed.  ;)
I guess it was a cut and paste error.  :(

This should probably cc: stable, too.

Thanks,

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  fs/xfs/xfs_sysfs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c
> index 276d302..de6195e 100644
> --- a/fs/xfs/xfs_sysfs.c
> +++ b/fs/xfs/xfs_sysfs.c
> @@ -396,7 +396,7 @@ max_retries_show(
>  	int		retries;
>  	struct xfs_error_cfg *cfg = to_error_cfg(kobject);
>  
> -	if (cfg->retry_timeout == XFS_ERR_RETRY_FOREVER)
> +	if (cfg->max_retries == XFS_ERR_RETRY_FOREVER)
>  		retries = -1;
>  	else
>  		retries = cfg->max_retries;
> @@ -422,7 +422,7 @@ max_retries_store(
>  		return -EINVAL;
>  
>  	if (val == -1)
> -		cfg->retry_timeout = XFS_ERR_RETRY_FOREVER;
> +		cfg->max_retries = XFS_ERR_RETRY_FOREVER;
>  	else
>  		cfg->max_retries = val;
>  	return count;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Darrick J. Wong Jan. 4, 2017, 5:58 a.m. UTC | #2 
On Tue, Jan 03, 2017 at 06:53:31PM +0100, Carlos Maiolino wrote:
> max_retries _show and _store functions should test against cfg->max_retries,
> not cfg->retry_timeout
> 
> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
> ---
>  fs/xfs/xfs_sysfs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c
> index 276d302..de6195e 100644
> --- a/fs/xfs/xfs_sysfs.c
> +++ b/fs/xfs/xfs_sysfs.c
> @@ -396,7 +396,7 @@ max_retries_show(
>  	int		retries;
>  	struct xfs_error_cfg *cfg = to_error_cfg(kobject);
>  
> -	if (cfg->retry_timeout == XFS_ERR_RETRY_FOREVER)
> +	if (cfg->max_retries == XFS_ERR_RETRY_FOREVER)
>  		retries = -1;
>  	else
>  		retries = cfg->max_retries;
> @@ -422,7 +422,7 @@ max_retries_store(
>  		return -EINVAL;
>  
>  	if (val == -1)
> -		cfg->retry_timeout = XFS_ERR_RETRY_FOREVER;
> +		cfg->max_retries = XFS_ERR_RETRY_FOREVER;

Applied, thanks.

--D

>  	else
>  		cfg->max_retries = val;
>  	return count;
> -- 
> 2.9.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Carlos Maiolino Jan. 4, 2017, 10:58 a.m. UTC | #3 
On Tue, Jan 03, 2017 at 12:19:53PM -0600, Eric Sandeen wrote:
> On 1/3/17 11:53 AM, Carlos Maiolino wrote:
> > max_retries _show and _store functions should test against cfg->max_retries,
> > not cfg->retry_timeout
> > 
> > Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
> 
> Whoever made those mistakes should be very ashamed.  ;)
> I guess it was a cut and paste error.  :(
> 
> This should probably cc: stable, too.

Yeah, I believe so,

maybe if I just forward the patch to stable might work? 
> 
> Thanks,
> 
> Reviewed-by: Eric Sandeen <sandeen@redhat.com>
> 
> > ---
> >  fs/xfs/xfs_sysfs.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c
> > index 276d302..de6195e 100644
> > --- a/fs/xfs/xfs_sysfs.c
> > +++ b/fs/xfs/xfs_sysfs.c
> > @@ -396,7 +396,7 @@ max_retries_show(
> >  	int		retries;
> >  	struct xfs_error_cfg *cfg = to_error_cfg(kobject);
> >  
> > -	if (cfg->retry_timeout == XFS_ERR_RETRY_FOREVER)
> > +	if (cfg->max_retries == XFS_ERR_RETRY_FOREVER)
> >  		retries = -1;
> >  	else
> >  		retries = cfg->max_retries;
> > @@ -422,7 +422,7 @@ max_retries_store(
> >  		return -EINVAL;
> >  
> >  	if (val == -1)
> > -		cfg->retry_timeout = XFS_ERR_RETRY_FOREVER;
> > +		cfg->max_retries = XFS_ERR_RETRY_FOREVER;
> >  	else
> >  		cfg->max_retries = val;
> >  	return count;
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Eric Sandeen Jan. 4, 2017, 3:46 p.m. UTC | #4 
On 1/4/17 4:58 AM, Carlos Maiolino wrote:
> On Tue, Jan 03, 2017 at 12:19:53PM -0600, Eric Sandeen wrote:
>> On 1/3/17 11:53 AM, Carlos Maiolino wrote:
>>> max_retries _show and _store functions should test against cfg->max_retries,
>>> not cfg->retry_timeout
>>>
>>> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
>>
>> Whoever made those mistakes should be very ashamed.  ;)
>> I guess it was a cut and paste error.  :(
>>
>> This should probably cc: stable, too.
> 
> Yeah, I believe so,
> 
> maybe if I just forward the patch to stable might work? 

if cc: stable gets added when it's committed, that'll suffice.

-Eric

>>
>> Thanks,
>>
>> Reviewed-by: Eric Sandeen <sandeen@redhat.com>
>>
>>> ---
>>>  fs/xfs/xfs_sysfs.c | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c
>>> index 276d302..de6195e 100644
>>> --- a/fs/xfs/xfs_sysfs.c
>>> +++ b/fs/xfs/xfs_sysfs.c
>>> @@ -396,7 +396,7 @@ max_retries_show(
>>>  	int		retries;
>>>  	struct xfs_error_cfg *cfg = to_error_cfg(kobject);
>>>  
>>> -	if (cfg->retry_timeout == XFS_ERR_RETRY_FOREVER)
>>> +	if (cfg->max_retries == XFS_ERR_RETRY_FOREVER)
>>>  		retries = -1;
>>>  	else
>>>  		retries = cfg->max_retries;
>>> @@ -422,7 +422,7 @@ max_retries_store(
>>>  		return -EINVAL;
>>>  
>>>  	if (val == -1)
>>> -		cfg->retry_timeout = XFS_ERR_RETRY_FOREVER;
>>> +		cfg->max_retries = XFS_ERR_RETRY_FOREVER;
>>>  	else
>>>  		cfg->max_retries = val;
>>>  	return count;
>>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c
index 276d302..de6195e 100644
--- a/fs/xfs/xfs_sysfs.c
+++ b/fs/xfs/xfs_sysfs.c
@@ -396,7 +396,7 @@  max_retries_show(
 	int		retries;
 	struct xfs_error_cfg *cfg = to_error_cfg(kobject);
 
-	if (cfg->retry_timeout == XFS_ERR_RETRY_FOREVER)
+	if (cfg->max_retries == XFS_ERR_RETRY_FOREVER)
 		retries = -1;
 	else
 		retries = cfg->max_retries;
@@ -422,7 +422,7 @@  max_retries_store(
 		return -EINVAL;
 
 	if (val == -1)
-		cfg->retry_timeout = XFS_ERR_RETRY_FOREVER;
+		cfg->max_retries = XFS_ERR_RETRY_FOREVER;
 	else
 		cfg->max_retries = val;
 	return count;