Author: mav
Date: Mon Oct  5 11:27:35 2015
New Revision: 288807
URL: https://svnweb.freebsd.org/changeset/base/288807

Log:
  MFC r288261: Move ioctl frontend defines where they belong.

Modified:
  stable/10/sys/cam/ctl/ctl_frontend_ioctl.c
  stable/10/sys/cam/ctl/ctl_private.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl_frontend_ioctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_frontend_ioctl.c  Mon Oct  5 11:26:46 2015        
(r288806)
+++ stable/10/sys/cam/ctl/ctl_frontend_ioctl.c  Mon Oct  5 11:27:35 2015        
(r288807)
@@ -56,6 +56,18 @@ __FBSDID("$FreeBSD$");
 #include <cam/ctl/ctl_debug.h>
 #include <cam/ctl/ctl_error.h>
 
+typedef enum {
+       CTL_IOCTL_INPROG,
+       CTL_IOCTL_DATAMOVE,
+       CTL_IOCTL_DONE
+} ctl_fe_ioctl_state;
+
+struct ctl_fe_ioctl_params {
+       struct cv               sem;
+       struct mtx              ioctl_mtx;
+       ctl_fe_ioctl_state      state;
+};
+
 struct cfi_softc {
        uint32_t                cur_tag_num;
        struct ctl_port         port;

Modified: stable/10/sys/cam/ctl/ctl_private.h
==============================================================================
--- stable/10/sys/cam/ctl/ctl_private.h Mon Oct  5 11:26:46 2015        
(r288806)
+++ stable/10/sys/cam/ctl/ctl_private.h Mon Oct  5 11:27:35 2015        
(r288807)
@@ -47,18 +47,6 @@
 #define        CTL_PROCESSOR_PRODUCT   "CTLPROCESSOR    "
 #define        CTL_UNKNOWN_PRODUCT     "CTLDEVICE       "
 
-typedef enum {
-       CTL_IOCTL_INPROG,
-       CTL_IOCTL_DATAMOVE,
-       CTL_IOCTL_DONE
-} ctl_fe_ioctl_state;
-
-struct ctl_fe_ioctl_params {
-       struct cv               sem;
-       struct mtx              ioctl_mtx;
-       ctl_fe_ioctl_state      state;
-};
-
 #define CTL_POOL_ENTRIES_OTHER_SC   200
 
 struct ctl_io_pool {
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to