xfs: per-filesystem stats in sysfs.
PATCH 6/7 xfs: per-filesystem stats in sysfs.
This patch implements per-filesystem stats objects in sysfs. It depends on the application of the previous patch series that develops the infrastructure to support both xfs global stats and xfs per-fs stats in sysfs.
Stats objects are instantiated when an xfs filesystem is mounted and deleted on unmount. With this patch, the stats directory is created and populated with the familiar stats and stats_clear files. Example:
/sys/fs/xfs/sda9/stats/stats /sys/fs/xfs/sda9/stats/stats_clear
With this patch, the individual counts within the new per-fs stats file(s) remain at zero. Functions that use the the macros to increment, decrement, and add-to the per-fs stats counts will be covered in a separate new patch to follow this one. Note that the counts within the global stats file (/sys/fs/xfs/stats/stats) advance normally and can be cleared as it was prior to this patch.
--- fs/xfs/xfs_mount.c | 24 +++++++++++++++++++++++- fs/xfs/xfs_mount.h | 1 + fs/xfs/xfs_super.c | 12 ++++-------- 3 files changed, 28 insertions(+), 9 deletions(-)
fs/xfs/xfs_mount.c +23 -1
@@ -693,9 +693,23 @@ xfs_mountfs(if (error) goto out; +/* +* Allocate stats memory and create stats sysfs object. +*/ + mp->m_stats.xs_stats = alloc_percpu(struct xfsstats); +if (!mp->m_stats.xs_stats) { + error =PTR_ERR (mp->m_stats.xs_stats); + goto out_remove_sysfs; + } + error =xfs_sysfs_init (&mp->m_stats.xs_kobj, &xfs_stats_ktype, + &mp->m_kobj, +"stats" ); +if (error) + goto out_free_stats; + error =xfs_uuid_mount (mp);if (error) - goto out_remove_sysfs; + goto out_del_stats;/* * Set the minimum read and write sizes
@@ -971,6 +985,10 @@ xfs_mountfs(xfs_da_unmount (mp); out_remove_uuid:xfs_uuid_unmount (mp); + out_del_stats: +xfs_sysfs_del (&mp->m_stats.xs_kobj); + out_free_stats: +free_percpu (mp->m_stats.xs_stats); out_remove_sysfs:xfs_sysfs_del (&mp->m_kobj); out:
@@ -1047,6 +1065,10 @@ xfs_unmountfs(xfs_warn (mp,"Unable to update superblock counters. " "Freespace may not be correct on next mount." ); +/* remove the stats kobject and free stats memory */ +xfs_sysfs_del (&mp->m_stats.xs_kobj); +free_percpu (mp->m_stats.xs_stats); +xfs_log_unmount (mp);xfs_da_unmount (mp);xfs_uuid_unmount (mp);
fs/xfs/xfs_mount.h +1 -0
@@ -127,6 +127,7 @@ typedef struct xfs_mount {int64_t m_low_space[XFS_LOWSP_MAX ];/* low free space thresholds */ struct xfs_kobj m_kobj; +struct xstats m_stats;/* per-fs stats */ struct workqueue_struct *m_buf_workqueue;struct workqueue_struct *m_data_workqueue;
fs/xfs/xfs_super.c +4 -8
@@ -1841,18 +1841,14 @@ init_xfs_fs(void) goto out_sysctl_unregister; } + xfsstats.xs_kobj.kobject.kset = xfs_kset; + xfsstats.xs_stats = alloc_percpu(struct xfsstats);if (!xfsstats.xs_stats) { error = -ENOMEM ; goto out_kset_unregister; } - xfsstats.xs_kobj.kobject.kset = xfs_kset; -if (!xfsstats.xs_kobj.kobject.kset) { - error = -ENOMEM ; - goto out_free_stats; - } - error =xfs_sysfs_init (&xfsstats.xs_kobj, &xfs_stats_ktype,NULL ,"stats" );if (error)
@@ -1862,7 +1858,7 @@ init_xfs_fs(void) xfs_dbg_kobj.kobject.kset = xfs_kset; error =xfs_sysfs_init (&xfs_dbg_kobj, &xfs_dbg_ktype,NULL ,"debug" );if (error) - goto out_del_stats; + goto out_remove_stats_obj;#endif error =xfs_qm_init ();
@@ -1879,7 +1875,7 @@ init_xfs_fs(void) out_remove_dbg_kobj:#ifdef DEBUG xfs_sysfs_del (&xfs_dbg_kobj); - out_del_stats: + out_remove_stats_obj:#endif xfs_sysfs_del (&xfsstats.xs_kobj); out_free_stats:
Signature · 6 lines
2.4.3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs