These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / s390 / char / sclp_rw.h

diff --git a/kernel/drivers/s390/char/sclp_rw.h b/kernel/drivers/s390/char/sclp_rw.h
index 7a7bfc9..e3b0290 100644 (file)
--- a/kernel/drivers/s390/char/sclp_rw.h
+++ b/kernel/drivers/s390/char/sclp_rw.h
@@ -45,6 +45,7 @@ struct mdb_header {
 struct mdb {
        struct mdb_header header;
        struct go go;
+       struct mto mto;
 } __attribute__((packed));
 
 struct msg_buf {
@@ -52,14 +53,9 @@ struct msg_buf {
        struct mdb mdb;
 } __attribute__((packed));
 
-struct write_sccb {
-       struct sccb_header header;
-       struct msg_buf msg_buf;
-} __attribute__((packed));
-
 /* The number of empty mto buffers that can be contained in a single sccb. */
-#define NR_EMPTY_MTO_PER_SCCB ((PAGE_SIZE - sizeof(struct sclp_buffer) - \
-                       sizeof(struct write_sccb)) / sizeof(struct mto))
+#define NR_EMPTY_MSG_PER_SCCB ((PAGE_SIZE - sizeof(struct sclp_buffer) - \
+                       sizeof(struct sccb_header)) / sizeof(struct msg_buf))
 
 /*
  * data structure for information about list of SCCBs (only for writing),
@@ -68,7 +64,8 @@ struct write_sccb {
 struct sclp_buffer {
        struct list_head list;          /* list_head for sccb_info chain */
        struct sclp_req request;
-       struct write_sccb *sccb;
+       void *sccb;
+       struct msg_buf *current_msg;
        char *current_line;
        int current_length;
        int retry_count;
@@ -76,8 +73,8 @@ struct sclp_buffer {
        unsigned short columns;
        unsigned short htab;
        /* statistics about this buffer */
-       unsigned int mto_char_sum;      /* # chars in sccb */
-       unsigned int mto_number;        /* # mtos in sccb */
+       unsigned int char_sum;          /* # chars in sccb */
+       unsigned int messages;          /* # messages in sccb */
        /* Callback that is called after reaching final status. */
        void (*callback)(struct sclp_buffer *, int);
 };