2.6.20-rc1-mm1 pktcdvd: cleanup
Subsystems (3)
PATCH 1/1 2.6.20-rc1-mm1 pktcdvd: cleanup
Hello,
this is a patch to cleanup some things in the pktcdvd driver for linux 2.6.20:
- update documentation
- use clear_bdi_congested/set_bdi_congested functions directly instead of old wrappers
- removed DECLARE_BUF_AS_STRING macro
Documentation/ABI/testing/debugfs-pktcdvd +2 -3
@@ -1,6 +1,6 @@ What: /debug/pktcdvd/pktcdvd[0-7] Date: Oct. 2006 -KernelVersion: 2.6.19 +KernelVersion: 2.6.20 Contact: Thomas Maier <[email protected]> Description:
@@ -11,8 +11,7 @@ The pktcdvd module (packet writing drive these files in debugfs: /debug/pktcdvd/pktcdvd[0-7]/ - info (0444) Lots of human readable driver - statistics and infos. Multiple lines! + info (0444) Lots of driver statistics and infos. Example: -------
Documentation/ABI/testing/sysfs-class-pktcdvd +1 -1
@@ -1,6 +1,6 @@ What: /sys/class/pktcdvd/ Date: Oct. 2006 -KernelVersion: 2.6.19 +KernelVersion: 2.6.20 Contact: Thomas Maier <[email protected]> Description:
Documentation/cdrom/packet-writing.txt +1 -1
@@ -93,7 +93,7 @@ Notes Using the pktcdvd sysfs interface --------------------------------- -Since Linux 2.6.19, the pktcdvd module has a sysfs interface +Since Linux 2.6.20, the pktcdvd module has a sysfs interface and can be controlled by it. For example the "pktcdvd" tool uses this interface. (see http://people.freenet.de/BalaGi#pktcdvd )
drivers/block/pktcdvd.c +7 -19
@@ -190,15 +190,6 @@ static struct attribute *kobj_pkt_attrs_ NULL }; -/* declares a char buffer[64] _dbuf, copies data from -* _b with length _l into it and ensures that _dbuf ends -* with a \0 character. -*/ -#define DECLARE_BUF_AS_STRING (_dbuf, _b, _l) \ - char _dbuf[64]; int dlen = (_l) < 0 ? 0 : (_l); \ - if (dlen >= sizeof(_dbuf)) dlen = sizeof(_dbuf)-1; \ - memcpy(_dbuf, _b, dlen); _dbuf[dlen] = 0 -static ssize_t kobj_pkt_show (struct kobject *kobj,struct attribute *attr,char *data) {
@@ -264,9 +255,8 @@ static ssize_t kobj_pkt_store(struct kob {struct pktcdvd_device *pd =to_pktcdvdkobj (kobj)->pd;int val; -DECLARE_BUF_AS_STRING (dbuf, data, len);/* ensure sscanf scans a string */ -if (strcmp (attr->name,"reset" ) ==0 && dlen >0 ) { +if (strcmp (attr->name,"reset" ) ==0 && len >0 ) { pd->stats.pkt_started =0 ; pd->stats.pkt_ended =0 ; pd->stats.secs_w =0 ;
@@ -274,7 +264,7 @@ static ssize_t kobj_pkt_store(struct kob pd->stats.secs_r =0 ; }else if (strcmp (attr->name,"congestion_off" ) ==0 - &&sscanf (dbuf,"%d" , &val) ==1 ) { + &&sscanf (data,"%d" , &val) ==1 ) {spin_lock (&pd->lock); pd->write_congestion_off = val; init_write_congestion_marks(&pd->write_congestion_off,
@@ -282,7 +272,7 @@ static ssize_t kobj_pkt_store(struct kobspin_unlock (&pd->lock); }else if (strcmp (attr->name,"congestion_on" ) ==0 - &&sscanf (dbuf,"%d" , &val) ==1 ) { + &&sscanf (data,"%d" , &val) ==1 ) {spin_lock (&pd->lock); pd->write_congestion_on = val; init_write_congestion_marks(&pd->write_congestion_off,
@@ -369,8 +359,7 @@ static ssize_t class_pktcdvd_store_add(s size_t count) {unsigned int major, minor; -DECLARE_BUF_AS_STRING (dbuf, buf, count); -if (sscanf (dbuf,"%u:%u" , &major, &minor) ==2 ) { +if (sscanf (buf,"%u:%u" , &major, &minor) ==2 ) {pkt_setup_dev (MKDEV (major, minor),NULL );return count; }
@@ -381,8 +370,7 @@ static ssize_t class_pktcdvd_store_remov size_t count) {unsigned int major, minor; -DECLARE_BUF_AS_STRING (dbuf, buf, count); -if (sscanf (dbuf,"%u:%u" , &major, &minor) ==2 ) { +if (sscanf (buf,"%u:%u" , &major, &minor) ==2 ) {pkt_remove_dev (MKDEV (major, minor));return count; }
@@ -1390,7 +1378,7 @@ try_next_bio: && pd->bio_queue_size <= pd->write_congestion_off);spin_unlock (&pd->lock);if (wakeup) -blk_clear_queue_congested (pd->disk->queue,WRITE ); +clear_bdi_congested (&pd->disk->queue->backing_dev_info,WRITE ); pkt->sleep_time =max (PACKET_WAIT_TIME ,1 );pkt_set_state (pkt,PACKET_WAITING_STATE );
@@ -2611,7 +2599,7 @@ static int pkt_make_request(request_queuspin_lock (&pd->lock);if (pd->write_congestion_on >0 && pd->bio_queue_size >= pd->write_congestion_on) { -blk_set_queue_congested (q,WRITE ); +set_bdi_congested (&q->backing_dev_info,WRITE ); do { spin_unlock(&pd->lock); congestion_wait(WRITE, HZ);
Please attach patches as inline text, not as a binary file, so that we can all read it.
Quoted 9 lines · Thomas Maier
Hello,
this is a patch to cleanup some things in the pktcdvd driver for linux 2.6.20:
- update documentation
- use clear_bdi_congested/set_bdi_congested functions directly instead of old wrappers
- removedDECLARE_BUF_AS_STRINGmacroSigned-off-by Thomas Maier <[email protected]>
Quoted 4 lines · Thomas Maier
this is a patch to cleanup some things in the pktcdvd driver for linux 2.6.20:
- update documentation
- removedDECLARE_BUF_AS_STRINGmacro
This part looks good.
Quoted 1 line
- use clear_bdi_congested/set_bdi_congested functions directly instead of old wrappers
I'm unsure about this one. What's the point of having the blk_clear_queue_congested()/blk_set_queue_congested() functions if they are not supposed to be used?
Signature · 2 lines
Peter Osterlund - [email protected] http://web.telia.com/~u89404340