Commit 77e722ec authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] (1/15) big struct block_device * push (first series)

 - remove abuses of blksize_size[] and (late) hardsect_size[].  Mostly
   drivers/s390/char/*, BTW...
parent be5faa03
...@@ -1343,13 +1343,14 @@ ccw_req_t * tape34xx_bread (struct request *req,tape_info_t* ti,int tapeblock_ma ...@@ -1343,13 +1343,14 @@ ccw_req_t * tape34xx_bread (struct request *req,tape_info_t* ti,int tapeblock_ma
ccw_req_t *cqr; ccw_req_t *cqr;
ccw1_t *ccw; ccw1_t *ccw;
__u8 *data; __u8 *data;
int s2b = blksize_size[tapeblock_major][ti->blk_minor]/hardsect_size[tapeblock_major][ti->blk_minor]; unsigned bsize = blksize_size[tapeblock_major][ti->blk_minor];
int s2b = bsize/hardsect_size[tapeblock_major][ti->blk_minor];
int realcount; int realcount;
int size,bhct = 0; int size,bhct = 0;
struct buffer_head* bh; struct buffer_head* bh;
for (bh = req->bh; bh; bh = bh->b_reqnext) { for (bh = req->bh; bh; bh = bh->b_reqnext) {
if (bh->b_size > blksize_size[tapeblock_major][ti->blk_minor]) if (bh->b_size > bsize)
for (size = 0; size < bh->b_size; size += blksize_size[tapeblock_major][ti->blk_minor]) for (size = 0; size < bh->b_size; size += bsize)
bhct++; bhct++;
else else
bhct++; bhct++;
...@@ -1396,17 +1397,17 @@ ccw_req_t * tape34xx_bread (struct request *req,tape_info_t* ti,int tapeblock_ma ...@@ -1396,17 +1397,17 @@ ccw_req_t * tape34xx_bread (struct request *req,tape_info_t* ti,int tapeblock_ma
ti->position=realcount+req->nr_sectors/s2b; ti->position=realcount+req->nr_sectors/s2b;
for (bh=req->bh;bh!=NULL;) { for (bh=req->bh;bh!=NULL;) {
ccw->flags = CCW_FLAG_CC; ccw->flags = CCW_FLAG_CC;
if (bh->b_size >= blksize_size[tapeblock_major][ti->blk_minor]) { if (bh->b_size >= bsize) {
for (size = 0; size < bh->b_size; size += blksize_size[tapeblock_major][ti->blk_minor]) { for (size = 0; size < bh->b_size; size += bsize) {
ccw++; ccw++;
ccw->flags = CCW_FLAG_CC; ccw->flags = CCW_FLAG_CC;
ccw->cmd_code = READ_FORWARD; ccw->cmd_code = READ_FORWARD;
ccw->count = blksize_size[tapeblock_major][ti->blk_minor]; ccw->count = bsize;
set_normalized_cda (ccw, __pa (bh->b_data + size)); set_normalized_cda (ccw, __pa (bh->b_data + size));
} }
bh = bh->b_reqnext; bh = bh->b_reqnext;
} else { /* group N bhs to fit into byt_per_blk */ } else { /* group N bhs to fit into byt_per_blk */
for (size = 0; bh != NULL && size < blksize_size[tapeblock_major][ti->blk_minor];) { for (size = 0; bh != NULL && size < bsize;) {
ccw++; ccw++;
ccw->flags = CCW_FLAG_DC; ccw->flags = CCW_FLAG_DC;
ccw->cmd_code = READ_FORWARD; ccw->cmd_code = READ_FORWARD;
...@@ -1415,10 +1416,10 @@ ccw_req_t * tape34xx_bread (struct request *req,tape_info_t* ti,int tapeblock_ma ...@@ -1415,10 +1416,10 @@ ccw_req_t * tape34xx_bread (struct request *req,tape_info_t* ti,int tapeblock_ma
size += bh->b_size; size += bh->b_size;
bh = bh->b_reqnext; bh = bh->b_reqnext;
} }
if (size != blksize_size[tapeblock_major][ti->blk_minor]) { if (size != bsize) {
PRINT_WARN ("Cannot fulfill small request %d vs. %d (%ld sects)\n", PRINT_WARN ("Cannot fulfill small request %d vs. %d (%ld sects)\n",
size, size,
blksize_size[tapeblock_major][ti->blk_minor], bsize,
req->nr_sectors); req->nr_sectors);
kfree(data); kfree(data);
tape_free_request (cqr); tape_free_request (cqr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment