diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-02 18:48:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-02 18:48:37 -0500 |
| commit | d6c24df08255e24dbd19b52dd322f61fbc30b11d (patch) | |
| tree | 1cd0773829c76daf2bf9cce9dd5df04ddac8c4ea /include | |
| parent | cb107161df3c52e58033554dcb40065964350f67 (diff) | |
| parent | 839559e10601ed4459c802cbfb69747bf1844078 (diff) | |
| download | linux-d6c24df08255e24dbd19b52dd322f61fbc30b11d.tar.gz linux-d6c24df08255e24dbd19b52dd322f61fbc30b11d.tar.bz2 linux-d6c24df08255e24dbd19b52dd322f61fbc30b11d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull SCSI target fixes from Nicholas Bellinger:
"This includes fixes from HCH for -rc1 configfs default_groups
conversion changes that ended up breaking some iscsi-target
default_groups, along with Sagi's ib_drain_qp() conversion for
iser-target to use the common caller now available to RDMA kernel
consumers in v4.6+ code"
* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
target: add a new add_wwn_groups fabrics method
target: initialize the nacl base CIT begfore init_nodeacl
target: remove ->fabric_cleanup_nodeacl
iser-target: Use ib_drain_qp
Diffstat (limited to 'include')
| -rw-r--r-- | include/target/target_core_fabric.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h index 685a51aa98cc..8ff6d40a294f 100644 --- a/include/target/target_core_fabric.h +++ b/include/target/target_core_fabric.h @@ -76,6 +76,7 @@ struct target_core_fabric_ops { struct se_wwn *(*fabric_make_wwn)(struct target_fabric_configfs *, struct config_group *, const char *); void (*fabric_drop_wwn)(struct se_wwn *); + void (*add_wwn_groups)(struct se_wwn *); struct se_portal_group *(*fabric_make_tpg)(struct se_wwn *, struct config_group *, const char *); void (*fabric_drop_tpg)(struct se_portal_group *); @@ -87,7 +88,6 @@ struct target_core_fabric_ops { struct config_group *, const char *); void (*fabric_drop_np)(struct se_tpg_np *); int (*fabric_init_nodeacl)(struct se_node_acl *, const char *); - void (*fabric_cleanup_nodeacl)(struct se_node_acl *); struct configfs_attribute **tfc_discovery_attrs; struct configfs_attribute **tfc_wwn_attrs; |