From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 8E8377F51 for ; Fri, 6 Jun 2014 08:13:41 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay1.corp.sgi.com (Postfix) with ESMTP id 310B48F8039 for ; Fri, 6 Jun 2014 06:13:40 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id 8SebEhQUVKmnnDLX for ; Fri, 06 Jun 2014 06:13:36 -0700 (PDT) Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s56DDZEl015582 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 6 Jun 2014 09:13:36 -0400 Received: from bfoster.bfoster ([10.18.41.237]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s56DDZmM009702 for ; Fri, 6 Jun 2014 09:13:35 -0400 From: Brian Foster Subject: [PATCH 4/6] xfs: add xlog sysfs kobject and attribute handlers Date: Fri, 6 Jun 2014 09:13:32 -0400 Message-Id: <1402060414-22075-5-git-send-email-bfoster@redhat.com> In-Reply-To: <1402060414-22075-1-git-send-email-bfoster@redhat.com> References: <1402060414-22075-1-git-send-email-bfoster@redhat.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com 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 --- fs/xfs/xfs_log.c | 9 +++++++++ fs/xfs/xfs_log_priv.h | 3 +++ fs/xfs/xfs_sysfs.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_sysfs.h | 1 + 4 files changed, 66 insertions(+) diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 292308d..8eb10d5 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -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; @@ -707,6 +708,11 @@ xfs_log_mount( } } + error = xfs_sysfs_init(&mp->m_log->l_kobject, &xfs_log_ktype, + &mp->m_log->l_kobject_complete, &mp->m_kobject, "log"); + if (error) + goto out_destroy_ail; + /* Normal transactions can now occur */ mp->m_log->l_flags &= ~XLOG_ACTIVE_RECOVERY; @@ -947,6 +953,9 @@ xfs_log_unmount( xfs_log_quiesce(mp); xfs_trans_ail_destroy(mp); + + xfs_sysfs_del(&mp->m_log->l_kobject, &mp->m_log->l_kobject_complete); + xlog_dealloc_log(mp->m_log); } diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index 9bc403a..ce1eee2 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h @@ -405,6 +405,9 @@ struct xlog { struct xlog_grant_head l_reserve_head; struct xlog_grant_head l_write_head; + struct kobject l_kobject; + struct completion l_kobject_complete; + /* The following field are used for debugging; need to hold icloglock */ #ifdef DEBUG char *l_iclog_bak[XLOG_MAX_ICLOGS]; diff --git a/fs/xfs/xfs_sysfs.c b/fs/xfs/xfs_sysfs.c index 41365fe..f837527 100644 --- a/fs/xfs/xfs_sysfs.c +++ b/fs/xfs/xfs_sysfs.c @@ -54,3 +54,56 @@ xfs_mp_release(struct kobject *kobj) struct kobj_type xfs_mp_ktype = { .release = xfs_mp_release, }; + +/* xlog */ + +static struct attribute *xfs_log_attrs[] = { + NULL, +}; + +STATIC ssize_t +xfs_log_show( + struct kobject *kobj, + struct attribute *attr, + char *buf) +{ + struct xlog *log = container_of(kobj, struct xlog, l_kobject); + struct xfs_sysfs_attr *xfs_attr = container_of(attr, + struct xfs_sysfs_attr, attr); + + return xfs_attr->show ? xfs_attr->show(buf, log) : 0; +} + +STATIC ssize_t +xfs_log_store( + struct kobject *kobj, + struct attribute *attr, + const char *buf, + size_t count) +{ + struct xlog *log = container_of(kobj, struct xlog, l_kobject); + struct xfs_sysfs_attr *xfs_attr = container_of(attr, + struct xfs_sysfs_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, +}; + +STATIC void +xfs_log_release(struct kobject *kobj) +{ + struct xlog *log = container_of(kobj, struct xlog, l_kobject); + + complete(&log->l_kobject_complete); +} + +struct kobj_type xfs_log_ktype = { + .release = xfs_log_release, + .sysfs_ops = &xfs_log_ops, + .default_attrs = xfs_log_attrs, +}; + diff --git a/fs/xfs/xfs_sysfs.h b/fs/xfs/xfs_sysfs.h index c885acf..469f218 100644 --- a/fs/xfs/xfs_sysfs.h +++ b/fs/xfs/xfs_sysfs.h @@ -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 int xfs_sysfs_init( -- 1.8.3.1 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs