svn commit: r288486 - head/usr.sbin/ctld

[Alexander Motin]

Author: mav
Date: Fri Oct  2 11:16:46 2015
New Revision: 288486
URL: https://svnweb.freebsd.org/changeset/base/288486

Log:
  Set default block size for CD to expected 2048 bytes.

Modified:
  head/usr.sbin/ctld/ctld.c
  head/usr.sbin/ctld/ctld.h

Modified: head/usr.sbin/ctld/ctld.c
==============================================================================
--- head/usr.sbin/ctld/ctld.c	Fri Oct  2 10:08:11 2015	(r288485)
+++ head/usr.sbin/ctld/ctld.c	Fri Oct  2 11:16:46 2015	(r288486)
@@ -1661,7 +1661,10 @@ conf_verify_lun(struct lun *lun)
 		}
 	}
 	if (lun->l_blocksize == 0) {
-		lun_set_blocksize(lun, DEFAULT_BLOCKSIZE);
+		if (lun->l_device_type == 5)
+			lun_set_blocksize(lun, DEFAULT_CD_BLOCKSIZE);
+		else
+			lun_set_blocksize(lun, DEFAULT_BLOCKSIZE);
 	} else if (lun->l_blocksize < 0) {
 		log_warnx("invalid blocksize for lun \"%s\"; "
 		    "must be larger than 0", lun->l_name);

Modified: head/usr.sbin/ctld/ctld.h
==============================================================================
--- head/usr.sbin/ctld/ctld.h	Fri Oct  2 10:08:11 2015	(r288485)
+++ head/usr.sbin/ctld/ctld.h	Fri Oct  2 11:16:46 2015	(r288486)
@@ -43,6 +43,7 @@
 #define	DEFAULT_CONFIG_PATH		"/etc/ctl.conf"
 #define	DEFAULT_PIDFILE			"/var/run/ctld.pid"
 #define	DEFAULT_BLOCKSIZE		512
+#define	DEFAULT_CD_BLOCKSIZE		2048
 
 #define	MAX_LUNS			1024
 #define	MAX_NAME_LEN			223