Skip to content

Commit

Permalink
xfs: add xlog sysfs kobject and attribute handlers
Browse files Browse the repository at this point in the history
Embed a kobject into the xfs log data structure (xlog). This creates a
'log' subdirectory for every XFS mount instance in sysfs. The lifecycle
of the log kobject is tied to the lifecycle of the log.

Also define a set of generic attribute handlers associated with the log
kobject in preparation for the addition of attributes.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
  • Loading branch information
Brian Foster authored and Dave Chinner committed Jul 14, 2014
1 parent a31b1d3 commit baff4e4
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 0 deletions.
9 changes: 9 additions & 0 deletions fs/xfs/xfs_log.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "xfs_trace.h"
#include "xfs_fsops.h"
#include "xfs_cksum.h"
#include "xfs_sysfs.h"

kmem_zone_t *xfs_log_ticket_zone;

Expand Down Expand Up @@ -707,6 +708,11 @@ xfs_log_mount(
}
}

error = xfs_sysfs_init(&mp->m_log->l_kobj, &xfs_log_ktype, &mp->m_kobj,
"log");
if (error)
goto out_destroy_ail;

/* Normal transactions can now occur */
mp->m_log->l_flags &= ~XLOG_ACTIVE_RECOVERY;

Expand Down Expand Up @@ -947,6 +953,9 @@ xfs_log_unmount(
xfs_log_quiesce(mp);

xfs_trans_ail_destroy(mp);

xfs_sysfs_del(&mp->m_log->l_kobj);

xlog_dealloc_log(mp->m_log);
}

Expand Down
2 changes: 2 additions & 0 deletions fs/xfs/xfs_log_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,8 @@ struct xlog {
struct xlog_grant_head l_reserve_head;
struct xlog_grant_head l_write_head;

struct xfs_kobj l_kobj;

/* The following field are used for debugging; need to hold icloglock */
#ifdef DEBUG
char *l_iclog_bak[XLOG_MAX_ICLOGS];
Expand Down
52 changes: 52 additions & 0 deletions fs/xfs/xfs_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@

#include "xfs.h"
#include "xfs_sysfs.h"
#include "xfs_log_format.h"
#include "xfs_log.h"
#include "xfs_log_priv.h"

struct xfs_sysfs_attr {
struct attribute attr;
Expand Down Expand Up @@ -47,3 +50,52 @@ to_attr(struct attribute *attr)
struct kobj_type xfs_mp_ktype = {
.release = xfs_sysfs_release,
};

/* xlog */

static struct attribute *xfs_log_attrs[] = {
NULL,
};

static inline struct xlog *
to_xlog(struct kobject *kobject)
{
struct xfs_kobj *kobj = to_kobj(kobject);
return container_of(kobj, struct xlog, l_kobj);
}

STATIC ssize_t
xfs_log_show(
struct kobject *kobject,
struct attribute *attr,
char *buf)
{
struct xlog *log = to_xlog(kobject);
struct xfs_sysfs_attr *xfs_attr = to_attr(attr);

return xfs_attr->show ? xfs_attr->show(buf, log) : 0;
}

STATIC ssize_t
xfs_log_store(
struct kobject *kobject,
struct attribute *attr,
const char *buf,
size_t count)
{
struct xlog *log = to_xlog(kobject);
struct xfs_sysfs_attr *xfs_attr = to_attr(attr);

return xfs_attr->store ? xfs_attr->store(buf, count, log) : 0;
}

static struct sysfs_ops xfs_log_ops = {
.show = xfs_log_show,
.store = xfs_log_store,
};

struct kobj_type xfs_log_ktype = {
.release = xfs_sysfs_release,
.sysfs_ops = &xfs_log_ops,
.default_attrs = xfs_log_attrs,
};
1 change: 1 addition & 0 deletions fs/xfs/xfs_sysfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#define __XFS_SYSFS_H__

extern struct kobj_type xfs_mp_ktype; /* xfs_mount */
extern struct kobj_type xfs_log_ktype; /* xlog */

static inline struct xfs_kobj *
to_kobj(struct kobject *kobject)
Expand Down

0 comments on commit baff4e4

Please sign in to comment.