| From hch@lst.de Tue Jan 10 11:31:32 2017 |
| From: Christoph Hellwig <hch@lst.de> |
| Date: Mon, 9 Jan 2017 16:39:03 +0100 |
| Subject: xfs: fix max_retries _show and _store functions |
| To: stable@vger.kernel.org |
| Cc: linux-xfs@vger.kernel.org, Carlos Maiolino <cmaiolino@redhat.com>, "Darrick J. Wong" <darrick.wong@oracle.com> |
| Message-ID: <1483976343-661-33-git-send-email-hch@lst.de> |
| |
| |
| From: Carlos Maiolino <cmaiolino@redhat.com> |
| |
| commit ff97f2399edac1e0fb3fa7851d5fbcbdf04717cf upstream. |
| |
| max_retries _show and _store functions should test against cfg->max_retries, |
| not cfg->retry_timeout |
| |
| Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com> |
| Reviewed-by: Eric Sandeen <sandeen@redhat.com> |
| Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> |
| Cc: Christoph Hellwig <hch@lst.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/xfs/xfs_sysfs.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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; |
