patch-2.4.25 linux-2.4.25/drivers/s390/block/dasd_int.h

• Lines: 71
• Date: 2004-02-18 05:36:31.000000000 -0800
• Orig file: linux-2.4.24/drivers/s390/block/dasd_int.h
• Orig date: 2003-08-25 04:44:42.000000000 -0700

diff -urN linux-2.4.24/drivers/s390/block/dasd_int.h linux-2.4.25/drivers/s390/block/dasd_int.h
@@ -5,7 +5,7 @@
  * Bugreports.to..: <Linux390@de.ibm.com>
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
  *
- * $Revision: 1.26 $
+ * $Revision: 1.36 $
  *
  * History of changes (starts July 2000)
  * 02/01/01 added dynamic registration of ioctls
@@ -292,6 +292,7 @@
                       d_args); \
 } while(0)
 
+/* general messages to be written via klogd and dbf */
 #define MESSAGE(d_loglevel,d_string,d_args...)\
 do { \
         printk(d_loglevel PRINTK_HEADER \
@@ -303,6 +304,14 @@
                   d_args); \
 } while(0)
 
+/* general messages to be written via klogd only */
+#define MESSAGE_LOG(d_loglevel,d_string,d_args...)\
+do { \
+        printk(d_loglevel PRINTK_HEADER \
+               " " d_string "\n", \
+               d_args); \
+} while(0)
+
 struct dasd_device_t;
 struct request;
 
@@ -321,11 +330,13 @@
 typedef int    (*dasd_info_fn_t)               (struct dasd_device_t *, 
                                                 dasd_information2_t *);
 typedef int    (*dasd_use_count_fn_t)          (int);
+typedef int    (*dasd_get_attrib_fn_t)         (struct dasd_device_t *, 
+                                                struct attrib_data_t *);
 typedef int    (*dasd_set_attrib_fn_t)         (struct dasd_device_t *, 
                                                 struct attrib_data_t *);
 typedef void   (*dasd_int_handler_fn_t)        (int irq, void *, 
                                                 struct pt_regs *);
-typedef char * (*dasd_dump_sense_fn_t)         (struct dasd_device_t *,
+typedef void   (*dasd_dump_sense_fn_t)         (struct dasd_device_t *,
                                                 ccw_req_t *);
 typedef ccw_req_t *(*dasd_format_fn_t)         (struct dasd_device_t *, 
                                                 struct format_data_t *);
@@ -378,6 +389,7 @@
         dasd_info_fn_t               fill_info;
         dasd_read_stats_fn_t         read_stats;
         dasd_ret_stats_fn_t          ret_stats;             /* return performance statistics */
+        dasd_get_attrib_fn_t         get_attrib;            /* get attributes (cache operations */ 
         dasd_set_attrib_fn_t         set_attrib;            /* set attributes (cache operations */ 
 	struct list_head list;	/* used for list of disciplines */
 } dasd_discipline_t;
@@ -429,10 +441,14 @@
         dasd_profile_info_t profile;
         ccw_req_t *init_cqr;
         atomic_t plugged;
-        int accessible; /* set to !=0 if doing IO is permitted */
+        int stopped;                         /* device (do_IO) was stopped */
         struct list_head lowmem_pool;
 }  dasd_device_t;
 
+/* reasons why device (do_IO) was stopped */
+#define DASD_STOPPED_NOT_ACC 1         /* not accessible */
+#define DASD_STOPPED_PENDING 2         /* long busy */
+
 
 int  dasd_init               (void);
 void dasd_discipline_add     (dasd_discipline_t *);