diff options
author | Borislav Petkov <petkovbb@googlemail.com> | 2008-04-27 09:38:33 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-27 09:38:33 -0400 |
commit | a997a4356ba33dcb9c061677d5943794a29489e8 (patch) | |
tree | 756d2b0246925d9527e5ca012f4f856f1e4b8277 /drivers/ide | |
parent | f73850a302de45c7cb6672d0e8b103c1f122b6ae (diff) |
ide-tape: mv tape->pages_per_stage tape->pages_per_buffer
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-tape.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 6836d0d92d8a..ea46ed8d0447 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -315,8 +315,7 @@ typedef struct ide_tape_obj { | |||
315 | char *b_data; | 315 | char *b_data; |
316 | int b_count; | 316 | int b_count; |
317 | 317 | ||
318 | /* Pipeline parameters. */ | 318 | int pages_per_buffer; |
319 | int pages_per_stage; | ||
320 | /* Wasted space in each stage */ | 319 | /* Wasted space in each stage */ |
321 | int excess_bh_size; | 320 | int excess_bh_size; |
322 | 321 | ||
@@ -1302,7 +1301,7 @@ static idetape_stage_t *ide_tape_kmalloc_buffer(idetape_tape_t *tape, int full, | |||
1302 | { | 1301 | { |
1303 | idetape_stage_t *stage; | 1302 | idetape_stage_t *stage; |
1304 | struct idetape_bh *prev_bh, *bh; | 1303 | struct idetape_bh *prev_bh, *bh; |
1305 | int pages = tape->pages_per_stage; | 1304 | int pages = tape->pages_per_buffer; |
1306 | unsigned int order, b_allocd; | 1305 | unsigned int order, b_allocd; |
1307 | char *b_data = NULL; | 1306 | char *b_data = NULL; |
1308 | 1307 | ||
@@ -2746,9 +2745,9 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor) | |||
2746 | tape->buffer_size = *ctl * tape->blk_size; | 2745 | tape->buffer_size = *ctl * tape->blk_size; |
2747 | } | 2746 | } |
2748 | buffer_size = tape->buffer_size; | 2747 | buffer_size = tape->buffer_size; |
2749 | tape->pages_per_stage = buffer_size / PAGE_SIZE; | 2748 | tape->pages_per_buffer = buffer_size / PAGE_SIZE; |
2750 | if (buffer_size % PAGE_SIZE) { | 2749 | if (buffer_size % PAGE_SIZE) { |
2751 | tape->pages_per_stage++; | 2750 | tape->pages_per_buffer++; |
2752 | tape->excess_bh_size = PAGE_SIZE - buffer_size % PAGE_SIZE; | 2751 | tape->excess_bh_size = PAGE_SIZE - buffer_size % PAGE_SIZE; |
2753 | } | 2752 | } |
2754 | 2753 | ||