You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
target: use per-attribute show and store methods
This also allows to remove the target-specific old configfs macros, and gets rid of the target_core_fabric_configfs.h header which only had one function declaration left that could be moved to a better place. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Nicholas Bellinger <nab@linux-iscsi.org> Acked-by: Nicholas Bellinger <nab@linux-iscsi.org> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Christoph Hellwig
committed by
Nicholas Bellinger
Nicholas Bellinger
parent
64c6be0e6d
commit
2eafd72939
@@ -1,147 +0,0 @@
|
||||
/* -*- mode: c; c-basic-offset: 8; -*-
|
||||
* vim: noexpandtab sw=8 ts=8 sts=0:
|
||||
*
|
||||
* configfs_macros.h - extends macros for configfs
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public
|
||||
* License along with this program; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 021110-1307, USA.
|
||||
*
|
||||
* Based on sysfs:
|
||||
* sysfs is Copyright (C) 2001, 2002, 2003 Patrick Mochel
|
||||
*
|
||||
* Based on kobject.h:
|
||||
* Copyright (c) 2002-2003 Patrick Mochel
|
||||
* Copyright (c) 2002-2003 Open Source Development Labs
|
||||
*
|
||||
* configfs Copyright (C) 2005 Oracle. All rights reserved.
|
||||
*
|
||||
* Added CONFIGFS_EATTR() macros from original configfs.h macros
|
||||
* Copright (C) 2008-2009 Nicholas A. Bellinger <nab@linux-iscsi.org>
|
||||
*
|
||||
* Please read Documentation/filesystems/configfs/configfs.txt before using
|
||||
* the configfs interface, ESPECIALLY the parts about reference counts and
|
||||
* item destructors.
|
||||
*/
|
||||
|
||||
#ifndef _CONFIGFS_MACROS_H_
|
||||
#define _CONFIGFS_MACROS_H_
|
||||
|
||||
#include <linux/configfs.h>
|
||||
|
||||
/*
|
||||
* Users often need to create attribute structures for their configurable
|
||||
* attributes, containing a configfs_attribute member and function pointers
|
||||
* for the show() and store() operations on that attribute. If they don't
|
||||
* need anything else on the extended attribute structure, they can use
|
||||
* this macro to define it. The argument _name isends up as
|
||||
* 'struct _name_attribute, as well as names of to CONFIGFS_ATTR_OPS() below.
|
||||
* The argument _item is the name of the structure containing the
|
||||
* struct config_item or struct config_group structure members
|
||||
*/
|
||||
#define CONFIGFS_EATTR_STRUCT(_name, _item) \
|
||||
struct _name##_attribute { \
|
||||
struct configfs_attribute attr; \
|
||||
ssize_t (*show)(struct _item *, char *); \
|
||||
ssize_t (*store)(struct _item *, const char *, size_t); \
|
||||
}
|
||||
|
||||
/*
|
||||
* With the extended attribute structure, users can use this macro
|
||||
* (similar to sysfs' __ATTR) to make defining attributes easier.
|
||||
* An example:
|
||||
* #define MYITEM_EATTR(_name, _mode, _show, _store) \
|
||||
* struct myitem_attribute childless_attr_##_name = \
|
||||
* __CONFIGFS_EATTR(_name, _mode, _show, _store)
|
||||
*/
|
||||
#define __CONFIGFS_EATTR(_name, _mode, _show, _store) \
|
||||
{ \
|
||||
.attr = { \
|
||||
.ca_name = __stringify(_name), \
|
||||
.ca_mode = _mode, \
|
||||
.ca_owner = THIS_MODULE, \
|
||||
}, \
|
||||
.show = _show, \
|
||||
.store = _store, \
|
||||
}
|
||||
/* Here is a readonly version, only requiring a show() operation */
|
||||
#define __CONFIGFS_EATTR_RO(_name, _show) \
|
||||
{ \
|
||||
.attr = { \
|
||||
.ca_name = __stringify(_name), \
|
||||
.ca_mode = 0444, \
|
||||
.ca_owner = THIS_MODULE, \
|
||||
}, \
|
||||
.show = _show, \
|
||||
}
|
||||
|
||||
/*
|
||||
* With these extended attributes, the simple show_attribute() and
|
||||
* store_attribute() operations need to call the show() and store() of the
|
||||
* attributes. This is a common pattern, so we provide a macro to define
|
||||
* them. The argument _name is the name of the attribute defined by
|
||||
* CONFIGFS_ATTR_STRUCT(). The argument _item is the name of the structure
|
||||
* containing the struct config_item or struct config_group structure member.
|
||||
* The argument _item_member is the actual name of the struct config_* struct
|
||||
* in your _item structure. Meaning my_structure->some_config_group.
|
||||
* ^^_item^^^^^ ^^_item_member^^^
|
||||
* This macro expects the attributes to be named "struct <name>_attribute".
|
||||
*/
|
||||
#define CONFIGFS_EATTR_OPS_TO_FUNC(_name, _item, _item_member) \
|
||||
static struct _item *to_##_name(struct config_item *ci) \
|
||||
{ \
|
||||
return (ci) ? container_of(to_config_group(ci), struct _item, \
|
||||
_item_member) : NULL; \
|
||||
}
|
||||
|
||||
#define CONFIGFS_EATTR_OPS_SHOW(_name, _item) \
|
||||
static ssize_t _name##_attr_show(struct config_item *item, \
|
||||
struct configfs_attribute *attr, \
|
||||
char *page) \
|
||||
{ \
|
||||
struct _item *_item = to_##_name(item); \
|
||||
struct _name##_attribute * _name##_attr = \
|
||||
container_of(attr, struct _name##_attribute, attr); \
|
||||
ssize_t ret = 0; \
|
||||
\
|
||||
if (_name##_attr->show) \
|
||||
ret = _name##_attr->show(_item, page); \
|
||||
return ret; \
|
||||
}
|
||||
|
||||
#define CONFIGFS_EATTR_OPS_STORE(_name, _item) \
|
||||
static ssize_t _name##_attr_store(struct config_item *item, \
|
||||
struct configfs_attribute *attr, \
|
||||
const char *page, size_t count) \
|
||||
{ \
|
||||
struct _item *_item = to_##_name(item); \
|
||||
struct _name##_attribute * _name##_attr = \
|
||||
container_of(attr, struct _name##_attribute, attr); \
|
||||
ssize_t ret = -EINVAL; \
|
||||
\
|
||||
if (_name##_attr->store) \
|
||||
ret = _name##_attr->store(_item, page, count); \
|
||||
return ret; \
|
||||
}
|
||||
|
||||
#define CONFIGFS_EATTR_OPS(_name, _item, _item_member) \
|
||||
CONFIGFS_EATTR_OPS_TO_FUNC(_name, _item, _item_member); \
|
||||
CONFIGFS_EATTR_OPS_SHOW(_name, _item); \
|
||||
CONFIGFS_EATTR_OPS_STORE(_name, _item);
|
||||
|
||||
#define CONFIGFS_EATTR_OPS_RO(_name, _item, _item_member) \
|
||||
CONFIGFS_EATTR_OPS_TO_FUNC(_name, _item, _item_member); \
|
||||
CONFIGFS_EATTR_OPS_SHOW(_name, _item);
|
||||
|
||||
#endif /* _CONFIGFS_MACROS_H_ */
|
||||
@@ -563,6 +563,36 @@ struct se_node_acl {
|
||||
struct kref acl_kref;
|
||||
};
|
||||
|
||||
static inline struct se_node_acl *acl_to_nacl(struct config_item *item)
|
||||
{
|
||||
return container_of(to_config_group(item), struct se_node_acl,
|
||||
acl_group);
|
||||
}
|
||||
|
||||
static inline struct se_node_acl *attrib_to_nacl(struct config_item *item)
|
||||
{
|
||||
return container_of(to_config_group(item), struct se_node_acl,
|
||||
acl_attrib_group);
|
||||
}
|
||||
|
||||
static inline struct se_node_acl *auth_to_nacl(struct config_item *item)
|
||||
{
|
||||
return container_of(to_config_group(item), struct se_node_acl,
|
||||
acl_auth_group);
|
||||
}
|
||||
|
||||
static inline struct se_node_acl *param_to_nacl(struct config_item *item)
|
||||
{
|
||||
return container_of(to_config_group(item), struct se_node_acl,
|
||||
acl_param_group);
|
||||
}
|
||||
|
||||
static inline struct se_node_acl *fabric_stat_to_nacl(struct config_item *item)
|
||||
{
|
||||
return container_of(to_config_group(item), struct se_node_acl,
|
||||
acl_fabric_stat_group);
|
||||
}
|
||||
|
||||
struct se_session {
|
||||
unsigned sess_tearing_down:1;
|
||||
u64 sess_bin_isid;
|
||||
@@ -820,6 +850,12 @@ struct se_tpg_np {
|
||||
struct config_group tpg_np_group;
|
||||
};
|
||||
|
||||
static inline struct se_tpg_np *to_tpg_np(struct config_item *item)
|
||||
{
|
||||
return container_of(to_config_group(item), struct se_tpg_np,
|
||||
tpg_np_group);
|
||||
}
|
||||
|
||||
struct se_portal_group {
|
||||
/*
|
||||
* PROTOCOL IDENTIFIER value per SPC4, 7.5.1.
|
||||
@@ -856,6 +892,30 @@ struct se_portal_group {
|
||||
struct config_group tpg_param_group;
|
||||
};
|
||||
|
||||
static inline struct se_portal_group *to_tpg(struct config_item *item)
|
||||
{
|
||||
return container_of(to_config_group(item), struct se_portal_group,
|
||||
tpg_group);
|
||||
}
|
||||
|
||||
static inline struct se_portal_group *attrib_to_tpg(struct config_item *item)
|
||||
{
|
||||
return container_of(to_config_group(item), struct se_portal_group,
|
||||
tpg_attrib_group);
|
||||
}
|
||||
|
||||
static inline struct se_portal_group *auth_to_tpg(struct config_item *item)
|
||||
{
|
||||
return container_of(to_config_group(item), struct se_portal_group,
|
||||
tpg_auth_group);
|
||||
}
|
||||
|
||||
static inline struct se_portal_group *param_to_tpg(struct config_item *item)
|
||||
{
|
||||
return container_of(to_config_group(item), struct se_portal_group,
|
||||
tpg_param_group);
|
||||
}
|
||||
|
||||
struct se_wwn {
|
||||
struct target_fabric_configfs *wwn_tf;
|
||||
struct config_group wwn_group;
|
||||
|
||||
@@ -1,122 +0,0 @@
|
||||
/*
|
||||
* Used for tfc_wwn_cit attributes
|
||||
*/
|
||||
|
||||
#include <target/configfs_macros.h>
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_nacl_attrib, se_node_acl);
|
||||
#define TF_NACL_ATTRIB_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_nacl_attrib_attribute _fabric##_nacl_attrib_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_nacl_attrib_show_##_name, \
|
||||
_fabric##_nacl_attrib_store_##_name);
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_nacl_auth, se_node_acl);
|
||||
#define TF_NACL_AUTH_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_nacl_auth_attribute _fabric##_nacl_auth_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_nacl_auth_show_##_name, \
|
||||
_fabric##_nacl_auth_store_##_name);
|
||||
|
||||
#define TF_NACL_AUTH_ATTR_RO(_fabric, _name) \
|
||||
static struct target_fabric_nacl_auth_attribute _fabric##_nacl_auth_##_name = \
|
||||
__CONFIGFS_EATTR_RO(_name, \
|
||||
_fabric##_nacl_auth_show_##_name);
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_nacl_param, se_node_acl);
|
||||
#define TF_NACL_PARAM_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_nacl_param_attribute _fabric##_nacl_param_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_nacl_param_show_##_name, \
|
||||
_fabric##_nacl_param_store_##_name);
|
||||
|
||||
#define TF_NACL_PARAM_ATTR_RO(_fabric, _name) \
|
||||
static struct target_fabric_nacl_param_attribute _fabric##_nacl_param_##_name = \
|
||||
__CONFIGFS_EATTR_RO(_name, \
|
||||
_fabric##_nacl_param_show_##_name);
|
||||
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_nacl_base, se_node_acl);
|
||||
#define TF_NACL_BASE_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_nacl_base_attribute _fabric##_nacl_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_nacl_show_##_name, \
|
||||
_fabric##_nacl_store_##_name);
|
||||
|
||||
#define TF_NACL_BASE_ATTR_RO(_fabric, _name) \
|
||||
static struct target_fabric_nacl_base_attribute _fabric##_nacl_##_name = \
|
||||
__CONFIGFS_EATTR_RO(_name, \
|
||||
_fabric##_nacl_show_##_name);
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_np_base, se_tpg_np);
|
||||
#define TF_NP_BASE_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_np_base_attribute _fabric##_np_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_np_show_##_name, \
|
||||
_fabric##_np_store_##_name);
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_tpg_attrib, se_portal_group);
|
||||
#define TF_TPG_ATTRIB_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_tpg_attrib_attribute _fabric##_tpg_attrib_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_tpg_attrib_show_##_name, \
|
||||
_fabric##_tpg_attrib_store_##_name);
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_tpg_auth, se_portal_group);
|
||||
#define TF_TPG_AUTH_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_tpg_auth_attribute _fabric##_tpg_auth_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_tpg_auth_show_##_name, \
|
||||
_fabric##_tpg_auth_store_##_name);
|
||||
|
||||
#define TF_TPG_AUTH_ATTR_RO(_fabric, _name) \
|
||||
static struct target_fabric_tpg_auth_attribute _fabric##_tpg_auth_##_name = \
|
||||
__CONFIGFS_EATTR_RO(_name, \
|
||||
_fabric##_tpg_auth_show_##_name);
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_tpg_param, se_portal_group);
|
||||
#define TF_TPG_PARAM_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_tpg_param_attribute _fabric##_tpg_param_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_tpg_param_show_##_name, \
|
||||
_fabric##_tpg_param_store_##_name);
|
||||
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_tpg, se_portal_group);
|
||||
#define TF_TPG_BASE_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_tpg_attribute _fabric##_tpg_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_tpg_show_##_name, \
|
||||
_fabric##_tpg_store_##_name);
|
||||
|
||||
|
||||
#define TF_TPG_BASE_ATTR_RO(_fabric, _name) \
|
||||
static struct target_fabric_tpg_attribute _fabric##_tpg_##_name = \
|
||||
__CONFIGFS_EATTR_RO(_name, \
|
||||
_fabric##_tpg_show_##_name);
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_wwn, target_fabric_configfs);
|
||||
#define TF_WWN_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_wwn_attribute _fabric##_wwn_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_wwn_show_attr_##_name, \
|
||||
_fabric##_wwn_store_attr_##_name);
|
||||
|
||||
#define TF_WWN_ATTR_RO(_fabric, _name) \
|
||||
static struct target_fabric_wwn_attribute _fabric##_wwn_##_name = \
|
||||
__CONFIGFS_EATTR_RO(_name, \
|
||||
_fabric##_wwn_show_attr_##_name);
|
||||
|
||||
CONFIGFS_EATTR_STRUCT(target_fabric_discovery, target_fabric_configfs);
|
||||
#define TF_DISC_ATTR(_fabric, _name, _mode) \
|
||||
static struct target_fabric_discovery_attribute _fabric##_disc_##_name = \
|
||||
__CONFIGFS_EATTR(_name, _mode, \
|
||||
_fabric##_disc_show_##_name, \
|
||||
_fabric##_disc_store_##_name);
|
||||
|
||||
#define TF_DISC_ATTR_RO(_fabric, _name) \
|
||||
static struct target_fabric_discovery_attribute _fabric##_disc_##_name = \
|
||||
__CONFIGFS_EATTR_RO(_name, \
|
||||
_fabric##_disc_show_##_name);
|
||||
|
||||
extern int target_fabric_setup_cits(struct target_fabric_configfs *);
|
||||
Reference in New Issue
Block a user