diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-03 19:42:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-03 19:42:30 -0500 |
| commit | 8482a0abe94e535bca25d22f8d46bbecbfe1f132 (patch) | |
| tree | 14dc34d6a8b9d9de016afa2ad5228e5068cf0895 | |
| parent | 233ba2c5ffcf83f3dee3f4451724273f76cb7d8b (diff) | |
| parent | 41f8ad76362e7aefe3a03949c43e23102dae6e0b (diff) | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
SCSI fixes from James Bottomley:
"There's just a single fix in here: the osd max device number fix."
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576
| -rw-r--r-- | drivers/scsi/osd/osd_uld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c index b31a8e3841d7..d4ed9eb52657 100644 --- a/drivers/scsi/osd/osd_uld.c +++ b/drivers/scsi/osd/osd_uld.c | |||
| @@ -69,10 +69,10 @@ | |||
| 69 | #ifndef SCSI_OSD_MAJOR | 69 | #ifndef SCSI_OSD_MAJOR |
| 70 | # define SCSI_OSD_MAJOR 260 | 70 | # define SCSI_OSD_MAJOR 260 |
| 71 | #endif | 71 | #endif |
| 72 | #define SCSI_OSD_MAX_MINOR 64 | 72 | #define SCSI_OSD_MAX_MINOR MINORMASK |
| 73 | 73 | ||
| 74 | static const char osd_name[] = "osd"; | 74 | static const char osd_name[] = "osd"; |
| 75 | static const char *osd_version_string = "open-osd 0.2.0"; | 75 | static const char *osd_version_string = "open-osd 0.2.1"; |
| 76 | 76 | ||
| 77 | MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>"); | 77 | MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>"); |
| 78 | MODULE_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko"); | 78 | MODULE_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko"); |