Messages in this thread Patch in this message | | | Date | Sun, 15 Aug 1999 20:08:55 +0100 (BST) | From | Mike <> | Subject | Re: [2.3.13] ? definition of WRITEA removed from include/linux/fs.h |
| |
On Tue, 10 Aug 1999, Paul Slootman wrote:
> However, this WRITEA is still used (e.g. drivers/block/md.c).
Yes, but it shouldn't be. The correct (I think) patch is:
diff -urN linux-2.3.13-clean/drivers/block/md.c linux-2.3.13/drivers/block/md.c --- linux-2.3.13-clean/drivers/block/md.c Sun Aug 15 20:00:32 1999 +++ linux-2.3.13/drivers/block/md.c Sun Aug 15 20:07:30 1999 @@ -740,7 +740,7 @@ if (buffer_locked(bh)) return 0; set_bit(BH_Lock, &bh->b_state); - if (rw == WRITE || rw == WRITEA) { + if (rw == WRITE) { if (!buffer_dirty(bh)) { bh->b_end_io(bh, test_bit(BH_Uptodate, &bh->b_state)); return 0; diff -urN linux-2.3.13-clean/drivers/block/raid1.c linux-2.3.13/drivers/block/raid1.c --- linux-2.3.13-clean/drivers/block/raid1.c Thu Jul 8 18:14:57 1999 +++ linux-2.3.13/drivers/block/raid1.c Sun Aug 15 20:07:31 1999 @@ -159,7 +159,7 @@ } /* - * WRITE or WRITEA. + * WRITE. */ PRINTK(("raid1_end_request(), write branch.\n")); @@ -215,15 +215,14 @@ memset (r1_bh, 0, sizeof (struct raid1_bh)); /* - * make_request() can abort the operation when READA or WRITEA are being + * make_request() can abort the operation when READA is being * used and no empty request is available. * * Currently, just replace the command with READ/WRITE. */ if (rw == READA) rw = READ; - if (rw == WRITEA) rw = WRITE; - if (rw == WRITE || rw == WRITEA) + if (rw == WRITE) mark_buffer_clean(bh); /* Too early ? */ /* @@ -269,7 +268,7 @@ } /* - * WRITE or WRITEA. + * WRITE. */ PRINTK(("raid1_make_request(n=%d), write branch.\n",n)); diff -urN linux-2.3.13-clean/drivers/block/raid5.c linux-2.3.13/drivers/block/raid5.c --- linux-2.3.13-clean/drivers/block/raid5.c Thu Jul 8 18:14:57 1999 +++ linux-2.3.13/drivers/block/raid5.c Sun Aug 15 20:07:31 1999 @@ -1206,7 +1206,6 @@ struct stripe_head *sh; if (rw == READA) rw = READ; - if (rw == WRITEA) rw = WRITE; new_sector = raid5_compute_sector(bh->b_rsector, raid_disks, data_disks, &dd_idx, &pd_idx, raid_conf); -- Mike <rickettm@ox.compsoc.net> "Our reruns are better than theirs." -- Nick at Nite
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
| |