git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
linux
/
pktcdvd.h
diff --git
a/include/linux/pktcdvd.h
b/include/linux/pktcdvd.h
index
4e2d2a9
..
8a94c71
100644
(file)
--- a/
include/linux/pktcdvd.h
+++ b/
include/linux/pktcdvd.h
@@
-114,7
+114,7
@@
struct pkt_ctrl_command {
struct packet_settings
{
struct packet_settings
{
- __u
8
size; /* packet size in (512 byte) sectors */
+ __u
32
size; /* packet size in (512 byte) sectors */
__u8 fp; /* fixed packets */
__u8 link_loss; /* the rest is specified
* as per Mt Fuji */
__u8 fp; /* fixed packets */
__u8 link_loss; /* the rest is specified
* as per Mt Fuji */
@@
-159,15
+159,18
@@
struct packet_iosched
struct bio *read_queue_tail;
struct bio *write_queue;
struct bio *write_queue_tail;
struct bio *read_queue_tail;
struct bio *write_queue;
struct bio *write_queue_tail;
-
int high_prio_read; /* An important read request has been queu
ed */
+
sector_t last_write; /* The sector where the last write end
ed */
int successive_reads;
};
/*
* 32 buffers of 2048 bytes
*/
int successive_reads;
};
/*
* 32 buffers of 2048 bytes
*/
-#define PACKET_MAX_SIZE 32
-#define PAGES_PER_PACKET (PACKET_MAX_SIZE * CD_FRAMESIZE / PAGE_SIZE)
+#if (PAGE_SIZE % CD_FRAMESIZE) != 0
+#error "PAGE_SIZE must be a multiple of CD_FRAMESIZE"
+#endif
+#define PACKET_MAX_SIZE 128
+#define FRAMES_PER_PAGE (PAGE_SIZE / CD_FRAMESIZE)
#define PACKET_MAX_SECTORS (PACKET_MAX_SIZE * CD_FRAMESIZE >> 9)
enum packet_data_state {
#define PACKET_MAX_SECTORS (PACKET_MAX_SIZE * CD_FRAMESIZE >> 9)
enum packet_data_state {
@@
-216,7
+219,7
@@
struct packet_data
atomic_t io_errors; /* Number of read/write errors during IO */
struct bio *r_bios[PACKET_MAX_SIZE]; /* bios to use during data gathering */
atomic_t io_errors; /* Number of read/write errors during IO */
struct bio *r_bios[PACKET_MAX_SIZE]; /* bios to use during data gathering */
- struct page *pages[PA
GES_PER_PACKET
];
+ struct page *pages[PA
CKET_MAX_SIZE / FRAMES_PER_PAGE
];
int cache_valid; /* If non-zero, the data for the zone defined */
/* by the sector variable is completely cached */
int cache_valid; /* If non-zero, the data for the zone defined */
/* by the sector variable is completely cached */