From 29a7a5ce67974c0c1dff5b5297b669fad551460b Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Sat, 18 Aug 2012 15:20:41 -0400 Subject: [PATCH] --- yaml --- r: 328826 b: refs/heads/master c: 6ed33a4a0b86da42638b5f6a0bb9f9f9aee89f60 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/scsi/st.txt | 6 ++---- trunk/drivers/scsi/st.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index df484cabe2a1..e0d2870e9696 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26898afd67dfd707aa291648ca731063c8333c7f +refs/heads/master: 6ed33a4a0b86da42638b5f6a0bb9f9f9aee89f60 diff --git a/trunk/Documentation/scsi/st.txt b/trunk/Documentation/scsi/st.txt index 685bf3582abe..f346abbdd6ff 100644 --- a/trunk/Documentation/scsi/st.txt +++ b/trunk/Documentation/scsi/st.txt @@ -112,10 +112,8 @@ attempted). MINOR NUMBERS -The tape driver currently supports 128 drives by default. This number -can be increased by editing st.h and recompiling the driver if -necessary. The upper limit is 2^17 drives if 4 modes for each drive -are used. +The tape driver currently supports up to 2^17 drives if 4 modes for +each drive are used. The minor numbers consist of the following bit fields: diff --git a/trunk/drivers/scsi/st.h b/trunk/drivers/scsi/st.h index b7a07c7bf4f8..f3eee0f9f40c 100644 --- a/trunk/drivers/scsi/st.h +++ b/trunk/drivers/scsi/st.h @@ -78,7 +78,7 @@ struct st_modedef { #define ST_MODE_SHIFT (7 - ST_NBR_MODE_BITS) #define ST_MODE_MASK ((ST_NBR_MODES - 1) << ST_MODE_SHIFT) -#define ST_MAX_TAPES 128 +#define ST_MAX_TAPES (1 << (20 - (ST_NBR_MODE_BITS + 1))) #define ST_MAX_TAPE_ENTRIES (ST_MAX_TAPES << (ST_NBR_MODE_BITS + 1)) /* The status related to each partition */