Date: Tue, 15 May 2012 16:17:30 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r235477 - in projects/zfsd/head/sys: amd64/conf cam/scsi conf i386/conf ia64/conf mips/conf pc98/conf sparc64/conf Message-ID: <201205151617.q4FGHUIY095186@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Tue May 15 16:17:30 2012 New Revision: 235477 URL: http://svn.freebsd.org/changeset/base/235477 Log: Rename enclosure management driver from "enc" back to "ses". "enc" name is already occupied by the enc(4) -- Encapsulating Interface. Modified: projects/zfsd/head/sys/amd64/conf/GENERIC projects/zfsd/head/sys/cam/scsi/scsi_enc.c projects/zfsd/head/sys/conf/files projects/zfsd/head/sys/i386/conf/GENERIC projects/zfsd/head/sys/ia64/conf/GENERIC projects/zfsd/head/sys/mips/conf/OCTEON1 projects/zfsd/head/sys/pc98/conf/GENERIC projects/zfsd/head/sys/sparc64/conf/GENERIC Modified: projects/zfsd/head/sys/amd64/conf/GENERIC ============================================================================== --- projects/zfsd/head/sys/amd64/conf/GENERIC Tue May 15 15:00:26 2012 (r235476) +++ projects/zfsd/head/sys/amd64/conf/GENERIC Tue May 15 16:17:30 2012 (r235477) @@ -135,7 +135,7 @@ device da # Direct Access (disks) device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct ATA/SCSI access) -device enc # Enclosure Services (SES and SAF-TE) +device ses # Enclosure Services (SES and SAF-TE) device ctl # CAM Target Layer # RAID controllers interfaced to the SCSI subsystem Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc.c ============================================================================== --- projects/zfsd/head/sys/cam/scsi/scsi_enc.c Tue May 15 15:00:26 2012 (r235476) +++ projects/zfsd/head/sys/cam/scsi/scsi_enc.c Tue May 15 16:17:30 2012 (r235477) @@ -81,7 +81,7 @@ SYSCTL_NODE(_kern_cam, OID_AUTO, enc, CT "CAM Enclosure Services driver"); static struct periph_driver encdriver = { - enc_init, "enc", + enc_init, "ses", TAILQ_HEAD_INITIALIZER(encdriver.units), /* generation */ 0 }; @@ -92,7 +92,7 @@ static struct cdevsw enc_cdevsw = { .d_open = enc_open, .d_close = enc_close, .d_ioctl = enc_ioctl, - .d_name = "enc", + .d_name = "ses", .d_flags = 0, }; @@ -219,7 +219,7 @@ enc_async(void *callback_arg, uint32_t c } status = cam_periph_alloc(enc_ctor, enc_oninvalidate, - enc_dtor, enc_start, "enc", CAM_PERIPH_BIO, + enc_dtor, enc_start, "ses", CAM_PERIPH_BIO, cgd->ccb_h.path, enc_async, AC_FOUND_DEVICE, cgd); if (status != CAM_REQ_CMP && status != CAM_REQ_INPROG) { Modified: projects/zfsd/head/sys/conf/files ============================================================================== --- projects/zfsd/head/sys/conf/files Tue May 15 15:00:26 2012 (r235476) +++ projects/zfsd/head/sys/conf/files Tue May 15 16:17:30 2012 (r235477) @@ -134,9 +134,9 @@ cam/scsi/scsi_low_pisa.c optional ct | n cam/scsi/scsi_pass.c optional pass cam/scsi/scsi_pt.c optional pt cam/scsi/scsi_sa.c optional sa -cam/scsi/scsi_enc.c optional enc -cam/scsi/scsi_enc_ses.c optional enc -cam/scsi/scsi_enc_safte.c optional enc +cam/scsi/scsi_enc.c optional ses +cam/scsi/scsi_enc_ses.c optional ses +cam/scsi/scsi_enc_safte.c optional ses cam/scsi/scsi_sg.c optional sg cam/scsi/scsi_targ_bh.c optional targbh cam/scsi/scsi_target.c optional targ Modified: projects/zfsd/head/sys/i386/conf/GENERIC ============================================================================== --- projects/zfsd/head/sys/i386/conf/GENERIC Tue May 15 15:00:26 2012 (r235476) +++ projects/zfsd/head/sys/i386/conf/GENERIC Tue May 15 16:17:30 2012 (r235477) @@ -142,7 +142,7 @@ device da # Direct Access (disks) device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct ATA/SCSI access) -device enc # Enclosure Services (SES and SAF-TE) +device ses # Enclosure Services (SES and SAF-TE) device ctl # CAM Target Layer # RAID controllers interfaced to the SCSI subsystem Modified: projects/zfsd/head/sys/ia64/conf/GENERIC ============================================================================== --- projects/zfsd/head/sys/ia64/conf/GENERIC Tue May 15 15:00:26 2012 (r235476) +++ projects/zfsd/head/sys/ia64/conf/GENERIC Tue May 15 16:17:30 2012 (r235477) @@ -113,7 +113,7 @@ device ch # Media changer device da # Direct Access (ie disk) device pass # Passthrough (direct ATA/SCSI access) device sa # Sequential Access (ie tape) -device enc # Enclosure Services (SES and SAF-TE) +device ses # Enclosure Services (SES and SAF-TE) device ctl # CAM Target Layer # RAID controllers Modified: projects/zfsd/head/sys/mips/conf/OCTEON1 ============================================================================== --- projects/zfsd/head/sys/mips/conf/OCTEON1 Tue May 15 15:00:26 2012 (r235476) +++ projects/zfsd/head/sys/mips/conf/OCTEON1 Tue May 15 16:17:30 2012 (r235477) @@ -135,7 +135,7 @@ device da # Direct Access (disks) device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct ATA/SCSI access) -device enc # Enclosure Services (SES and SAF-TE) +device ses # Enclosure Services (SES and SAF-TE) # RAID controllers interfaced to the SCSI subsystem device amr # AMI MegaRAID Modified: projects/zfsd/head/sys/pc98/conf/GENERIC ============================================================================== --- projects/zfsd/head/sys/pc98/conf/GENERIC Tue May 15 15:00:26 2012 (r235476) +++ projects/zfsd/head/sys/pc98/conf/GENERIC Tue May 15 16:17:30 2012 (r235477) @@ -110,7 +110,7 @@ device da # Direct Access (disks) device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct ATA/SCSI access) -device enc # Enclosure Services (SES and SAF-TE) +device ses # Enclosure Services (SES and SAF-TE) # keyboard driver device pckbd # PC98 keyboard Modified: projects/zfsd/head/sys/sparc64/conf/GENERIC ============================================================================== --- projects/zfsd/head/sys/sparc64/conf/GENERIC Tue May 15 15:00:26 2012 (r235476) +++ projects/zfsd/head/sys/sparc64/conf/GENERIC Tue May 15 16:17:30 2012 (r235477) @@ -118,7 +118,7 @@ device da # Direct Access (disks) device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct ATA/SCSI access) -device enc # Enclosure Services (SES and SAF-TE) +device ses # Enclosure Services (SES and SAF-TE) device ctl # CAM Target Layer # RAID controllers
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205151617.q4FGHUIY095186>