path: root/sys/cam/ctl/ctl_frontend_iscsi.c
diff options
authorAlexander Motin <mav@FreeBSD.org>2015-06-20 12:43:54 +0000
committerAlexander Motin <mav@FreeBSD.org>2015-06-20 12:43:54 +0000
commit7834ea889177aceb4bd38c22a43383f49b197d12 (patch)
tree287352e4fccaca8bdaefed2866ef09f449dfb46a /sys/cam/ctl/ctl_frontend_iscsi.c
parent2d8b28765ca359b200f2dc0a46f82be89fd93e9d (diff)
Bring per-port LUN enable/disable code up to date:
- remove last remnants of never implemented multiple targets support; - implement missing support for LUN mapping in this area. Due to existing locking constraints LUN mapping code is practically unlocked at this point. Hopefully it is not racy enough to live until somebody get idea how to call sleeping fronend methods under lock also taken by the same frontend in non-sleepable context. :(
Notes: svn path=/head/; revision=284640
Diffstat (limited to 'sys/cam/ctl/ctl_frontend_iscsi.c')
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index 2742c3da4893..652c961b4970 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -147,10 +147,8 @@ int cfiscsi_init(void);
static void cfiscsi_online(void *arg);
static void cfiscsi_offline(void *arg);
static int cfiscsi_info(void *arg, struct sbuf *sb);
-static int cfiscsi_lun_enable(void *arg,
- struct ctl_id target_id, int lun_id);
-static int cfiscsi_lun_disable(void *arg,
- struct ctl_id target_id, int lun_id);
+static int cfiscsi_lun_enable(void *arg, int lun_id);
+static int cfiscsi_lun_disable(void *arg, int lun_id);
static int cfiscsi_ioctl(struct cdev *dev,
u_long cmd, caddr_t addr, int flag, struct thread *td);
static void cfiscsi_datamove(union ctl_io *io);
@@ -2373,14 +2371,14 @@ cfiscsi_target_find_or_create(struct cfiscsi_softc *softc, const char *name,
static int
-cfiscsi_lun_enable(void *arg, struct ctl_id target_id, int lun_id)
+cfiscsi_lun_enable(void *arg, int lun_id)
return (0);
static int
-cfiscsi_lun_disable(void *arg, struct ctl_id target_id, int lun_id)
+cfiscsi_lun_disable(void *arg, int lun_id)
return (0);