summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/bio.h1
-rw-r--r--include/linux/cyclades.h3
-rw-r--r--include/linux/generic_serial.h5
-rw-r--r--include/linux/hayesesp.h3
-rw-r--r--include/linux/isdn.h5
-rw-r--r--include/linux/isicom.h3
-rw-r--r--include/linux/istallion.h3
-rw-r--r--include/linux/raid/linear.h2
-rw-r--r--include/linux/raid/md.h16
-rw-r--r--include/linux/raid/multipath.h3
-rw-r--r--include/linux/raid/raid0.h19
-rw-r--r--include/linux/raid/raid1.h11
-rw-r--r--include/linux/raid/raid5.h3
-rw-r--r--include/linux/serial167.h3
-rw-r--r--include/linux/serialP.h3
-rw-r--r--include/linux/stallion.h3
-rw-r--r--include/net/irda/ircomm_tty.h3
17 files changed, 19 insertions, 70 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 3921d3b751b9..119340a6a484 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -222,6 +222,7 @@ struct bio_pair {
};
extern struct bio_pair *bio_split(struct bio *bi, mempool_t *pool,
int first_sectors);
+extern mempool_t *bio_split_pool;
extern void bio_pair_release(struct bio_pair *dbio);
extern struct bio *bio_alloc(int, int);
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index 0bd07de0e255..1e4165e822c2 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -588,8 +588,6 @@ struct cyclades_port {
int breakon;
int breakoff;
int blocked_open; /* # of blocked opens */
- long session; /* Session of opening process */
- long pgrp; /* pgrp of opening process */
unsigned char *xmit_buf;
int xmit_head;
int xmit_tail;
@@ -599,7 +597,6 @@ struct cyclades_port {
unsigned long jiffies[3];
unsigned long rflush_count;
struct termios normal_termios;
- struct termios callout_termios;
struct cyclades_monitor mon;
struct cyclades_idle_stats idle_stats;
struct cyclades_icount icount;
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index cc5441324f3c..35ee1c1fdd3e 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -37,11 +37,8 @@ struct gs_port {
/* struct semaphore port_write_sem; */
int flags;
struct termios normal_termios;
- struct termios callout_termios;
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
- long session;
- long pgrp;
int count;
int blocked_open;
struct tty_struct *tty;
@@ -67,8 +64,6 @@ struct gs_port {
#define GS_TYPE_NORMAL 1
-#define GS_TYPE_CALLOUT 2
-
#define GS_DEBUG_FLUSH 0x00000001
#define GS_DEBUG_BTR 0x00000002
diff --git a/include/linux/hayesesp.h b/include/linux/hayesesp.h
index 00774e5d4550..6c1e096b77ed 100644
--- a/include/linux/hayesesp.h
+++ b/include/linux/hayesesp.h
@@ -96,8 +96,6 @@ struct esp_struct {
int line;
int count; /* # of fd on device */
int blocked_open; /* # of blocked opens */
- long session; /* Session of opening process */
- long pgrp; /* pgrp of opening process */
unsigned char *xmit_buf;
int xmit_head;
int xmit_tail;
@@ -105,7 +103,6 @@ struct esp_struct {
struct work_struct tqueue;
struct work_struct tqueue_hangup;
struct termios normal_termios;
- struct termios callout_termios;
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
wait_queue_head_t delta_msr_wait;
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index a54091f5ff89..88326d844312 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -250,8 +250,6 @@ typedef struct {
#define ISDN_ASYNC_SPLIT_TERMIOS 0x0008 /* Sep. termios for dialin/out */
#define ISDN_SERIAL_XMIT_SIZE 1024 /* Default bufsize for write */
#define ISDN_SERIAL_XMIT_MAX 4000 /* Maximum bufsize for write */
-#define ISDN_SERIAL_TYPE_NORMAL 1
-#define ISDN_SERIAL_TYPE_CALLOUT 2
#ifdef CONFIG_ISDN_AUDIO
/* For using sk_buffs with audio we need some private variables
@@ -301,8 +299,6 @@ typedef struct modem_info {
int line;
int count; /* # of fd on device */
int blocked_open; /* # of blocked opens */
- long session; /* Session of opening process */
- long pgrp; /* pgrp of opening process */
int online; /* 1 = B-Channel is up, drop data */
/* 2 = B-Channel is up, deliver d.*/
int dialing; /* Dial in progress or ATA */
@@ -348,7 +344,6 @@ typedef struct modem_info {
struct timer_list connect_timer; /* waiting for CONNECT */
struct timer_list read_timer; /* read incoming data */
struct termios normal_termios; /* For saving termios structs */
- struct termios callout_termios;
wait_queue_head_t open_wait, close_wait;
struct semaphore write_sem;
} modem_info;
diff --git a/include/linux/isicom.h b/include/linux/isicom.h
index 72114196a2fc..a7d9dd5cd5e5 100644
--- a/include/linux/isicom.h
+++ b/include/linux/isicom.h
@@ -148,8 +148,6 @@ struct isi_port {
unsigned short channel;
unsigned short status;
unsigned short closing_wait;
- long session;
- long pgrp;
struct isi_board * card;
struct tty_struct * tty;
wait_queue_head_t close_wait;
@@ -161,7 +159,6 @@ struct isi_port {
int xmit_tail;
int xmit_cnt;
struct termios normal_termios;
- struct termios callout_termios;
};
diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index c93624048244..a712bf1c0120 100644
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -66,8 +66,6 @@ typedef struct {
int rc;
int argsize;
void *argp;
- long session;
- long pgrp;
unsigned int rxmarkmsk;
struct tty_struct *tty;
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0))
@@ -81,7 +79,6 @@ typedef struct {
#endif
struct work_struct tqhangup;
struct termios normaltermios;
- struct termios callouttermios;
asysigs_t asig;
unsigned long addr;
unsigned long rxoffset;
diff --git a/include/linux/raid/linear.h b/include/linux/raid/linear.h
index 44c79eb016ac..70afc1dc8b43 100644
--- a/include/linux/raid/linear.h
+++ b/include/linux/raid/linear.h
@@ -19,9 +19,9 @@ struct linear_hash
struct linear_private_data
{
struct linear_hash *hash_table;
- dev_info_t disks[MD_SB_DISKS];
dev_info_t *smallest;
int nr_zones;
+ dev_info_t disks[0];
};
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h
index 98f0d1e27c4c..240dc450dcd3 100644
--- a/include/linux/raid/md.h
+++ b/include/linux/raid/md.h
@@ -40,6 +40,7 @@
#include <linux/reboot.h>
#include <linux/vmalloc.h>
#include <linux/blkpg.h>
+#include <linux/bio.h>
/*
* 'md_p.h' holds the 'physical' layout of RAID devices
@@ -61,21 +62,6 @@
#define MD_MINOR_VERSION 90
#define MD_PATCHLEVEL_VERSION 0
-/*
- * XXX(hch): This function is broken. Someone who understands the md
- * code needs to go through all callers, check whether bdev could
- * be NULL and replace it with direct calls to bdevmame.
- *
- * This would also fix the returns buffer on stack issue nicely :)
- */
-static inline const char *bdev_partition_name (struct block_device *bdev)
-{
- char b[BDEVNAME_SIZE];
-
- if (!bdev)
- return __bdevname(0, b);
- return bdevname(bdev, b);
-}
extern int register_md_personality (int p_num, mdk_personality_t *p);
extern int unregister_md_personality (int p_num);
extern mdk_thread_t * md_register_thread (void (*run) (mddev_t *mddev),
diff --git a/include/linux/raid/multipath.h b/include/linux/raid/multipath.h
index 42d040ea63df..a8db266ab705 100644
--- a/include/linux/raid/multipath.h
+++ b/include/linux/raid/multipath.h
@@ -2,7 +2,6 @@
#define _MULTIPATH_H
#include <linux/raid/md.h>
-#include <linux/bio.h>
struct multipath_info {
mdk_rdev_t *rdev;
@@ -10,7 +9,7 @@ struct multipath_info {
struct multipath_private_data {
mddev_t *mddev;
- struct multipath_info multipaths[MD_SB_DISKS];
+ struct multipath_info *multipaths;
int raid_disks;
int working_disks;
spinlock_t device_lock;
diff --git a/include/linux/raid/raid0.h b/include/linux/raid/raid0.h
index c2d5dcd52fab..1b2dda035f8e 100644
--- a/include/linux/raid/raid0.h
+++ b/include/linux/raid/raid0.h
@@ -8,22 +8,19 @@ struct strip_zone
sector_t zone_offset; /* Zone offset in md_dev */
sector_t dev_offset; /* Zone offset in real dev */
sector_t size; /* Zone size */
- int nb_dev; /* # of devices attached to the zone */
- mdk_rdev_t *dev[MD_SB_DISKS]; /* Devices attached to the zone */
-};
-
-struct raid0_hash
-{
- struct strip_zone *zone0, *zone1;
+ int nb_dev; /* # of devices attached to the zone */
+ mdk_rdev_t **dev; /* Devices attached to the zone */
};
struct raid0_private_data
{
- struct raid0_hash *hash_table; /* Dynamically allocated */
- struct strip_zone *strip_zone; /* This one too */
+ struct strip_zone **hash_table; /* Table of indexes into strip_zone */
+ struct strip_zone *strip_zone;
+ mdk_rdev_t **devlist; /* lists of rdevs, pointed to by strip_zone->dev */
int nr_strip_zones;
- struct strip_zone *smallest;
- int nr_zones;
+
+ sector_t hash_spacing;
+ int preshift; /* shift this before divide by hash_spacing */
};
typedef struct raid0_private_data raid0_conf_t;
diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h
index cc7aa899a613..a9d1161ccab3 100644
--- a/include/linux/raid/raid1.h
+++ b/include/linux/raid/raid1.h
@@ -14,7 +14,7 @@ typedef struct r1bio_s r1bio_t;
struct r1_private_data_s {
mddev_t *mddev;
- mirror_info_t mirrors[MD_SB_DISKS];
+ mirror_info_t *mirrors;
int raid_disks;
int working_disks;
int last_used;
@@ -67,13 +67,14 @@ struct r1bio_s {
*/
struct bio *read_bio;
int read_disk;
- /*
- * if the IO is in WRITE direction, then multiple bios are used:
- */
- struct bio *write_bios[MD_SB_DISKS];
r1bio_t *next_r1; /* next for retry or in free list */
struct list_head retry_list;
+ /*
+ * if the IO is in WRITE direction, then multiple bios are used.
+ * We choose the number when they are allocated.
+ */
+ struct bio *write_bios[0];
};
/* bits for r1bio.state */
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h
index c9eea7c884d0..fb61a8967408 100644
--- a/include/linux/raid/raid5.h
+++ b/include/linux/raid/raid5.h
@@ -3,7 +3,6 @@
#include <linux/raid/md.h>
#include <linux/raid/xor.h>
-#include <linux/bio.h>
/*
*
@@ -203,7 +202,6 @@ struct disk_info {
struct raid5_private_data {
struct stripe_head **stripe_hashtbl;
mddev_t *mddev;
- struct disk_info disks[MD_SB_DISKS];
struct disk_info *spare;
int chunk_size, level, algorithm;
int raid_disks, working_disks, failed_disks;
@@ -225,6 +223,7 @@ struct raid5_private_data {
* waiting for 25% to be free
*/
spinlock_t device_lock;
+ struct disk_info disks[0];
};
typedef struct raid5_private_data raid5_conf_t;
diff --git a/include/linux/serial167.h b/include/linux/serial167.h
index 1683e8941c04..1573385b24bc 100644
--- a/include/linux/serial167.h
+++ b/include/linux/serial167.h
@@ -43,8 +43,6 @@ struct cyclades_port {
int x_char; /* to be pushed out ASAP */
int x_break;
int blocked_open; /* # of blocked opens */
- long session; /* Session of opening process */
- long pgrp; /* pgrp of opening process */
unsigned char *xmit_buf;
int xmit_head;
int xmit_tail;
@@ -53,7 +51,6 @@ struct cyclades_port {
int default_timeout;
struct work_struct tqueue;
struct termios normal_termios;
- struct termios callout_termios;
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
struct cyclades_monitor mon;
diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index eb81e4e9b181..9900626e1027 100644
--- a/include/linux/serialP.h
+++ b/include/linux/serialP.h
@@ -50,7 +50,6 @@ struct serial_state {
unsigned short closing_wait; /* time to wait before closing */
struct async_icount icount;
struct termios normal_termios;
- struct termios callout_termios;
int io_type;
struct async_struct *info;
struct pci_dev *dev;
@@ -80,8 +79,6 @@ struct async_struct {
unsigned long last_active;
int line;
int blocked_open; /* # of blocked opens */
- long session; /* Session of opening process */
- long pgrp; /* pgrp of opening process */
struct circ_buf xmit;
spinlock_t xmit_lock;
u8 *iomem_base;
diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index 50cc96401196..298bb015dadd 100644
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -84,8 +84,6 @@ typedef struct stlport {
int refcount;
int openwaitcnt;
int brklen;
- long session;
- long pgrp;
unsigned int sigs;
unsigned int rxignoremsk;
unsigned int rxmarkmsk;
@@ -103,7 +101,6 @@ typedef struct stlport {
wait_queue_head_t close_wait;
#endif
struct termios normaltermios;
- struct termios callouttermios;
struct work_struct tqueue;
comstats_t stats;
stlrq_t tx;
diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
index 7ff56638b9d6..0b446540751d 100644
--- a/include/net/irda/ircomm_tty.h
+++ b/include/net/irda/ircomm_tty.h
@@ -93,7 +93,6 @@ struct ircomm_tty_cb {
void *ckey;
struct termios normal_termios;
- struct termios callout_termios;
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
@@ -103,8 +102,6 @@ struct ircomm_tty_cb {
unsigned short close_delay;
unsigned short closing_wait; /* time to wait before closing */
- long session; /* Session of opening process */
- long pgrp; /* pgrp of opening process */
int open_count;
int blocked_open; /* # of blocked opens */
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-29 09:17:22 +0000