Move the "offload" clause from the target section to portal-group

section; it makes more sense there.

MFC after:	1 month
Sponsored by:	The FreeBSD Foundation

1 files changed, 17 insertions, 18 deletions

diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index 425f591..2f4f147 100644
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -637,6 +637,7 @@ portal_group_delete(struct portal_group *pg)
 	TAILQ_FOREACH_SAFE(portal, &pg->pg_portals, p_next, tmp)
 		portal_delete(portal);
 	free(pg->pg_name);
+	free(pg->pg_offload);
 	free(pg->pg_redirection);
 	free(pg);
 }
@@ -1023,6 +1024,22 @@ portal_group_set_filter(struct portal_group *pg, const char *str)
 }
 
 int
+portal_group_set_offload(struct portal_group *pg, const char *offload)
+{
+
+	if (pg->pg_offload != NULL) {
+		log_warnx("cannot set offload to \"%s\" for "
+		    "portal-group \"%s\"; already defined",
+		    offload, pg->pg_name);
+		return (1);
+	}
+
+	pg->pg_offload = checked_strdup(offload);
+
+	return (0);
+}
+
+int
 portal_group_set_redirection(struct portal_group *pg, const char *addr)
 {
 
@@ -1361,22 +1378,6 @@ target_set_redirection(struct target *target, const char *addr)
 	return (0);
 }
 
-int
-target_set_offload(struct target *target, const char *offload)
-{
-
-	if (target->t_offload != NULL) {
-		log_warnx("cannot set offload to \"%s\" for "
-		    "target \"%s\"; already defined",
-		    offload, target->t_name);
-		return (1);
-	}
-
-	target->t_offload = checked_strdup(offload);
-
-	return (0);
-}
-
 struct lun *
 lun_new(struct conf *conf, const char *name)
 {
@@ -1619,8 +1620,6 @@ conf_print(struct conf *conf)
 		fprintf(stderr, "target %s {\n", targ->t_name);
 		if (targ->t_alias != NULL)
 			fprintf(stderr, "\t alias %s\n", targ->t_alias);
-		if (targ->t_offload != NULL)
-			fprintf(stderr, "\t offload %s\n", targ->t_offload);
 		fprintf(stderr, "}\n");
 	}
 }