summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorCarlos Maiolino <cmaiolino@redhat.com>2016-05-18 11:01:00 +1000
committerDave Chinner <david@fromorbit.com>2016-05-18 11:01:00 +1000
commitffd40ef697dfd3e06f44b1bb5fea93079de8c77d (patch)
treebd0c6c9286e453b6076c43033d0a4a86ab752727 /fs
parent192852be8b5fb14268c2133fe9ce5312e4745963 (diff)
xfs: introduce metadata IO error class
Now we have the basic infrastructure, add the first error class so we can build up the infrastructure in a meaningful way. Add the metadata async write IO error class and sysfs entry, and introduce a default configuration that matches the existing "retry forever" behavior for async write metadata buffers. Signed-off-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_mount.h3
-rw-r--r--fs/xfs/xfs_sysfs.c34
2 files changed, 37 insertions, 0 deletions
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index d639795b0310..352a5c88d7e9 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -44,9 +44,11 @@ enum {
* Error numbers define the errors that are configurable.
*/
enum {
+ XFS_ERR_METADATA,
XFS_ERR_CLASS_MAX,
};
enum {
+ XFS_ERR_DEFAULT,
XFS_ERR_ERRNO_MAX,
};
@@ -146,6 +148,7 @@ typedef struct xfs_mount {
/* low free space thresholds */
struct xfs_kobj m_kobj;
struct xfs_kobj m_error_kobj;
+ struct xfs_kobj m_error_meta_kobj;
struct xfs_error_cfg m_error_cfg[XFS_ERR_CLASS_MAX][XFS_ERR_ERRNO_MAX];
struct xstats m_stats; /* per-fs stats */
diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c
index 74e394071242..07c95999541e 100644
--- a/fs/xfs/xfs_sysfs.c
+++ b/fs/xfs/xfs_sysfs.c
@@ -399,11 +399,34 @@ int
xfs_error_sysfs_init(
struct xfs_mount *mp)
{
+ struct xfs_error_cfg *cfg;
int error;
/* .../xfs/<dev>/error/ */
error = xfs_sysfs_init(&mp->m_error_kobj, &xfs_error_ktype,
&mp->m_kobj, "error");
+ if (error)
+ return error;
+
+ /* .../xfs/<dev>/error/metadata/ */
+ error = xfs_sysfs_init(&mp->m_error_meta_kobj, &xfs_error_ktype,
+ &mp->m_error_kobj, "metadata");
+ if (error)
+ goto out_error;
+
+ cfg = &mp->m_error_cfg[XFS_ERR_METADATA][XFS_ERR_DEFAULT];
+ error = xfs_sysfs_init(&cfg->kobj, &xfs_error_cfg_ktype,
+ &mp->m_error_meta_kobj, "default");
+ if (error)
+ goto out_error_meta;
+ cfg->max_retries = -1;
+
+ return 0;
+
+out_error_meta:
+ xfs_sysfs_del(&mp->m_error_meta_kobj);
+out_error:
+ xfs_sysfs_del(&mp->m_error_kobj);
return error;
}
@@ -411,5 +434,16 @@ void
xfs_error_sysfs_del(
struct xfs_mount *mp)
{
+ struct xfs_error_cfg *cfg;
+ int i, j;
+
+ for (i = 0; i < XFS_ERR_CLASS_MAX; i++) {
+ for (j = 0; j < XFS_ERR_ERRNO_MAX; j++) {
+ cfg = &mp->m_error_cfg[i][j];
+
+ xfs_sysfs_del(&cfg->kobj);
+ }
+ }
+ xfs_sysfs_del(&mp->m_error_meta_kobj);
xfs_sysfs_del(&mp->m_error_kobj);
}