Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262584AbUJ0TcQ (ORCPT ); Wed, 27 Oct 2004 15:32:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262657AbUJ0TUv (ORCPT ); Wed, 27 Oct 2004 15:20:51 -0400 Received: from pimout1-ext.prodigy.net ([207.115.63.77]:30100 "EHLO pimout1-ext.prodigy.net") by vger.kernel.org with ESMTP id S262646AbUJ0TKu (ORCPT ); Wed, 27 Oct 2004 15:10:50 -0400 Date: Wed, 27 Oct 2004 12:05:23 -0700 From: Chris Wedgwood To: Jens Axboe Cc: Jeff Garzik , LKML , Bartlomiej Zolnierkiewicz Subject: [PATCH] Rename SECTOR_SIZE to BIO_SECTOR_SIZE Message-ID: <20041027190523.GA19330@taniwha.stupidest.org> References: <20041027060828.GA32396@taniwha.stupidest.org> <417F4497.3020205@pobox.com> <20041027065524.GA1524@taniwha.stupidest.org> <20041027072212.GN15910@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041027072212.GN15910@suse.de> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 12691 Lines: 338 Rename (one of the uses of) SECTOR_SIZE to BIO_SECTOR_SIZE which is more appropriate. Signed-off-by: Chris Wedgwood --- Rediffed against the BK tree from a few minutes ago. drivers/char/ftape/lowlevel/ftape-bsm.h | 2 - drivers/ide/ide-cd.c | 54 ++++++++++++++++---------------- drivers/ide/ide-cd.h | 15 +++----- drivers/ide/ide-io.c | 2 - drivers/ide/ide-taskfile.c | 6 +-- drivers/ide/pci/siimage.c | 2 - include/linux/ide.h | 4 +- 7 files changed, 41 insertions(+), 44 deletions(-) Index: cw-current/drivers/char/ftape/lowlevel/ftape-bsm.h =================================================================== --- cw-current.orig/drivers/char/ftape/lowlevel/ftape-bsm.h 2004-10-26 22:59:51.628352414 -0700 +++ cw-current/drivers/char/ftape/lowlevel/ftape-bsm.h 2004-10-27 11:35:13.237711103 -0700 @@ -36,7 +36,7 @@ /* maximum (format code 4) bad sector map size (bytes). */ -#define BAD_SECTOR_MAP_SIZE (29 * SECTOR_SIZE - 256) +#define BAD_SECTOR_MAP_SIZE (29 * BIO_SECTOR_SIZE - 256) /* format code 4 bad sector entry, ftape uses this * internally for all format codes Index: cw-current/drivers/ide/ide-cd.c =================================================================== --- cw-current.orig/drivers/ide/ide-cd.c 2004-10-26 22:59:51.643352933 -0700 +++ cw-current/drivers/ide/ide-cd.c 2004-10-27 11:35:13.240711206 -0700 @@ -965,7 +965,7 @@ /* Number of sectors to read into the buffer. */ int sectors_to_buffer = min_t(int, sectors_to_transfer, - (SECTOR_BUFFER_SIZE >> SECTOR_BITS) - + (CD_SECTOR_BUFFER_SIZE >> CD_SECTOR_BITS) - info->nsectors_buffered); char *dest; @@ -979,18 +979,18 @@ info->sector_buffered = sector; /* Read the data into the buffer. */ - dest = info->buffer + info->nsectors_buffered * SECTOR_SIZE; + dest = info->buffer + info->nsectors_buffered * BIO_SECTOR_SIZE; while (sectors_to_buffer > 0) { - HWIF(drive)->atapi_input_bytes(drive, dest, SECTOR_SIZE); + HWIF(drive)->atapi_input_bytes(drive, dest, BIO_SECTOR_SIZE); --sectors_to_buffer; --sectors_to_transfer; ++info->nsectors_buffered; - dest += SECTOR_SIZE; + dest += BIO_SECTOR_SIZE; } /* Throw away any remaining data. */ while (sectors_to_transfer > 0) { - static char dum[SECTOR_SIZE]; + static char dum[BIO_SECTOR_SIZE]; HWIF(drive)->atapi_input_bytes(drive, dum, sizeof (dum)); --sectors_to_transfer; } @@ -1093,9 +1093,9 @@ return ide_stopped; /* Assume that the drive will always provide data in multiples - of at least SECTOR_SIZE, as it gets hairy to keep track + of at least BIO_SECTOR_SIZE, as it gets hairy to keep track of the transfers otherwise. */ - if ((len % SECTOR_SIZE) != 0) { + if ((len % BIO_SECTOR_SIZE) != 0) { printk ("%s: cdrom_read_intr: Bad transfer size %d\n", drive->name, len); if (CDROM_CONFIG_FLAGS(drive)->limit_nframes) @@ -1109,7 +1109,7 @@ } /* The number of sectors we need to read from the drive. */ - sectors_to_transfer = len / SECTOR_SIZE; + sectors_to_transfer = len / BIO_SECTOR_SIZE; /* First, figure out if we need to bit-bucket any of the leading sectors. */ @@ -1117,7 +1117,7 @@ while (nskip > 0) { /* We need to throw away a sector. */ - static char dum[SECTOR_SIZE]; + static char dum[BIO_SECTOR_SIZE]; HWIF(drive)->atapi_input_bytes(drive, dum, sizeof (dum)); --rq->current_nr_sectors; @@ -1149,8 +1149,8 @@ /* Read this_transfer sectors into the current buffer. */ while (this_transfer > 0) { - HWIF(drive)->atapi_input_bytes(drive, rq->buffer, SECTOR_SIZE); - rq->buffer += SECTOR_SIZE; + HWIF(drive)->atapi_input_bytes(drive, rq->buffer, BIO_SECTOR_SIZE); + rq->buffer += BIO_SECTOR_SIZE; --rq->nr_sectors; --rq->current_nr_sectors; ++rq->sector; @@ -1175,7 +1175,7 @@ struct request *rq = HWGROUP(drive)->rq; unsigned short sectors_per_frame; - sectors_per_frame = queue_hardsect_size(drive->queue) >> SECTOR_BITS; + sectors_per_frame = queue_hardsect_size(drive->queue) >> CD_SECTOR_BITS; /* Can't do anything if there's no buffer. */ if (info->buffer == NULL) return 0; @@ -1190,9 +1190,9 @@ memcpy (rq->buffer, info->buffer + - (rq->sector - info->sector_buffered) * SECTOR_SIZE, - SECTOR_SIZE); - rq->buffer += SECTOR_SIZE; + (rq->sector - info->sector_buffered) * BIO_SECTOR_SIZE, + BIO_SECTOR_SIZE); + rq->buffer += BIO_SECTOR_SIZE; --rq->current_nr_sectors; --rq->nr_sectors; ++rq->sector; @@ -1236,7 +1236,7 @@ unsigned short sectors_per_frame; int nskip; - sectors_per_frame = queue_hardsect_size(drive->queue) >> SECTOR_BITS; + sectors_per_frame = queue_hardsect_size(drive->queue) >> CD_SECTOR_BITS; /* If the requested sector doesn't start on a cdrom block boundary, we must adjust the start of the transfer so that it does, @@ -1298,7 +1298,7 @@ struct request *rq = HWGROUP(drive)->rq; sector_t frame = rq->sector; - sector_div(frame, queue_hardsect_size(drive->queue) >> SECTOR_BITS); + sector_div(frame, queue_hardsect_size(drive->queue) >> CD_SECTOR_BITS); memset(rq->cmd, 0, sizeof(rq->cmd)); rq->cmd[0] = GPCMD_SEEK; @@ -1323,7 +1323,7 @@ static void restore_request (struct request *rq) { if (rq->buffer != bio_data(rq->bio)) { - sector_t n = (rq->buffer - (char *) bio_data(rq->bio)) / SECTOR_SIZE; + sector_t n = (rq->buffer - (char *) bio_data(rq->bio)) / BIO_SECTOR_SIZE; rq->buffer = bio_data(rq->bio); rq->nr_sectors += n; @@ -1344,7 +1344,7 @@ struct request *rq = HWGROUP(drive)->rq; unsigned short sectors_per_frame; - sectors_per_frame = queue_hardsect_size(drive->queue) >> SECTOR_BITS; + sectors_per_frame = queue_hardsect_size(drive->queue) >> CD_SECTOR_BITS; /* We may be retrying this request after an error. Fix up any weirdness which might be present in the request packet. */ @@ -1837,7 +1837,7 @@ if (cdrom_write_check_ireason(drive, len, ireason)) return ide_stopped; - sectors_to_transfer = len / SECTOR_SIZE; + sectors_to_transfer = len / BIO_SECTOR_SIZE; /* * now loop and write out the data @@ -1856,8 +1856,8 @@ this_transfer = min_t(int, sectors_to_transfer, rq->current_nr_sectors); while (this_transfer > 0) { - HWIF(drive)->atapi_output_bytes(drive, rq->buffer, SECTOR_SIZE); - rq->buffer += SECTOR_SIZE; + HWIF(drive)->atapi_output_bytes(drive, rq->buffer, BIO_SECTOR_SIZE); + rq->buffer += BIO_SECTOR_SIZE; --rq->nr_sectors; --rq->current_nr_sectors; ++rq->sector; @@ -1893,7 +1893,7 @@ { struct cdrom_info *info = drive->driver_data; struct gendisk *g = drive->disk; - unsigned short sectors_per_frame = queue_hardsect_size(drive->queue) >> SECTOR_BITS; + unsigned short sectors_per_frame = queue_hardsect_size(drive->queue) >> CD_SECTOR_BITS; /* * writes *must* be hardware frame aligned @@ -2195,7 +2195,7 @@ if (stat == 0) { *capacity = 1 + be32_to_cpu(capbuf.lba); *sectors_per_frame = - be32_to_cpu(capbuf.blocklen) >> SECTOR_BITS; + be32_to_cpu(capbuf.blocklen) >> CD_SECTOR_BITS; } return stat; @@ -2238,7 +2238,7 @@ struct atapi_toc_entry ent; } ms_tmp; long last_written; - unsigned long sectors_per_frame = SECTORS_PER_FRAME; + unsigned long sectors_per_frame = CD_SECTORS_PER_FRAME; if (toc == NULL) { /* Try to allocate space. */ @@ -2266,7 +2266,7 @@ set_capacity(drive->disk, toc->capacity * sectors_per_frame); blk_queue_hardsect_size(drive->queue, - sectors_per_frame << SECTOR_BITS); + sectors_per_frame << CD_SECTOR_BITS); /* First read just the header, so we know how long the TOC is. */ stat = cdrom_read_tocentry(drive, 0, 1, 0, (char *) &toc->hdr, @@ -3375,7 +3375,7 @@ drive->usage++; if (!info->buffer) - info->buffer = kmalloc(SECTOR_BUFFER_SIZE, + info->buffer = kmalloc(CD_SECTOR_BUFFER_SIZE, GFP_KERNEL|__GFP_REPEAT); if (!info->buffer || (rc = cdrom_open(&info->devinfo, inode, file))) drive->usage--; Index: cw-current/drivers/ide/ide-cd.h =================================================================== --- cw-current.orig/drivers/ide/ide-cd.h 2004-10-26 22:59:51.656353382 -0700 +++ cw-current/drivers/ide/ide-cd.h 2004-10-27 11:35:13.242711276 -0700 @@ -43,14 +43,11 @@ /************************************************************************/ -#define SECTOR_BITS 9 -#ifndef SECTOR_SIZE -#define SECTOR_SIZE (1 << SECTOR_BITS) -#endif -#define SECTORS_PER_FRAME (CD_FRAMESIZE >> SECTOR_BITS) -#define SECTOR_BUFFER_SIZE (CD_FRAMESIZE * 32) -#define SECTORS_BUFFER (SECTOR_BUFFER_SIZE >> SECTOR_BITS) -#define SECTORS_MAX (131072 >> SECTOR_BITS) +#define CD_SECTOR_BITS 9 +#define CD_SECTORS_PER_FRAME (CD_FRAMESIZE >> CD_SECTOR_BITS) +#define CD_SECTOR_BUFFER_SIZE (CD_FRAMESIZE * 32) +#define CD_SECTORS_BUFFER (SECTOR_BUFFER_SIZE >> CD_SECTOR_BITS) +#define CD_SECTORS_MAX (131072 >> CD_SECTOR_BITS) #define BLOCKS_PER_FRAME (CD_FRAMESIZE / BLOCK_SIZE) @@ -84,7 +81,7 @@ __u8 supp_disc_present : 1; /* Changer can report exact contents of slots. */ __u8 limit_nframes : 1; /* Drive does not provide data in - multiples of SECTOR_SIZE when more + multiples of CD_SECTOR_SIZE when more than one interrupt is needed. */ __u8 seeking : 1; /* Seeking in progress */ __u8 audio_play : 1; /* can do audio related commands */ Index: cw-current/drivers/ide/ide-io.c =================================================================== --- cw-current.orig/drivers/ide/ide-io.c 2004-10-26 22:59:51.668353797 -0700 +++ cw-current/drivers/ide/ide-io.c 2004-10-27 11:35:13.243711310 -0700 @@ -686,7 +686,7 @@ if ((rq->flags & REQ_DRIVE_TASKFILE) == 0) { hwif->sg_nents = blk_rq_map_sg(drive->queue, rq, sg); } else { - sg_init_one(sg, rq->buffer, rq->nr_sectors * SECTOR_SIZE); + sg_init_one(sg, rq->buffer, rq->nr_sectors * BIO_SECTOR_SIZE); hwif->sg_nents = 1; } } Index: cw-current/drivers/ide/ide-taskfile.c =================================================================== --- cw-current.orig/drivers/ide/ide-taskfile.c 2004-10-27 11:33:06.148315966 -0700 +++ cw-current/drivers/ide/ide-taskfile.c 2004-10-27 11:35:13.244711345 -0700 @@ -281,12 +281,12 @@ local_irq_save(flags); #endif buf = kmap_atomic(page, KM_BIO_SRC_IRQ) + - sg[hwif->cursg].offset + (hwif->cursg_ofs * SECTOR_SIZE); + sg[hwif->cursg].offset + (hwif->cursg_ofs * BIO_SECTOR_SIZE); hwif->nleft--; hwif->cursg_ofs++; - if ((hwif->cursg_ofs * SECTOR_SIZE) == sg[hwif->cursg].length) { + if ((hwif->cursg_ofs * BIO_SECTOR_SIZE) == sg[hwif->cursg].length) { hwif->cursg++; hwif->cursg_ofs = 0; } @@ -481,7 +481,7 @@ if (data_size == 0) rq.nr_sectors = (args->hobRegister[IDE_NSECTOR_OFFSET] << 8) | args->tfRegister[IDE_NSECTOR_OFFSET]; else - rq.nr_sectors = data_size / SECTOR_SIZE; + rq.nr_sectors = data_size / BIO_SECTOR_SIZE; if (!rq.nr_sectors) { printk(KERN_ERR "%s: in/out command without data\n", Index: cw-current/drivers/ide/pci/siimage.c =================================================================== --- cw-current.orig/drivers/ide/pci/siimage.c 2004-10-27 11:33:06.171316761 -0700 +++ cw-current/drivers/ide/pci/siimage.c 2004-10-27 11:35:13.245711379 -0700 @@ -470,7 +470,7 @@ #ifdef SIIMAGE_VIRTUAL_DMAPIO struct request *rq = HWGROUP(drive)->rq; ide_hwif_t *hwif = HWIF(drive); - u32 count = (rq->nr_sectors * SECTOR_SIZE); + u32 count = (rq->nr_sectors * BIO_SECTOR_SIZE); u32 rcount = 0; unsigned long addr = siimage_selreg(hwif, 0x1C); Index: cw-current/include/linux/ide.h =================================================================== --- cw-current.orig/include/linux/ide.h 2004-10-27 11:33:06.237319044 -0700 +++ cw-current/include/linux/ide.h 2004-10-27 11:35:13.246711414 -0700 @@ -202,8 +202,8 @@ #define PARTN_BITS 6 /* number of minor dev bits for partitions */ #define PARTN_MASK ((1< (b2) + (t)) || ((b2) > (b1) + (t))) /* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/