diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 19:54:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 19:54:31 -0400 |
| commit | 961cde93dee2658000ead32abffb8ddf0727abe0 (patch) | |
| tree | 2419e204132abe2ec2bb7f08bd20042573cc9bd6 /drivers/scsi/sd.c | |
| parent | f82c37e7bb4c4d9b6a476c642d5c2d2efbd6f240 (diff) | |
| parent | 0d9dc7c8b9b7fa0f53647423b41056ee1beed735 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (69 commits)
[SCSI] scsi_transport_fc: Fix synchronization issue while deleting vport
[SCSI] bfa: Update the driver version to 2.1.2.1.
[SCSI] bfa: Remove unused header files and did some cleanup.
[SCSI] bfa: Handle SCSI IO underrun case.
[SCSI] bfa: FCS and include file changes.
[SCSI] bfa: Modified the portstats get/clear logic
[SCSI] bfa: Replace bfa_get_attr() with specific APIs
[SCSI] bfa: New portlog entries for events (FIP/FLOGI/FDISC/LOGO).
[SCSI] bfa: Rename pport to fcport in BFA FCS.
[SCSI] bfa: IOC fixes, check for IOC down condition.
[SCSI] bfa: In MSIX mode, ignore spurious RME interrupts when FCoE ports are in FW mismatch state.
[SCSI] bfa: Fix Command Queue (CPE) full condition check and ack CPE interrupt.
[SCSI] bfa: IOC recovery fix in fcmode.
[SCSI] bfa: AEN and byte alignment fixes.
[SCSI] bfa: Introduce a link notification state machine.
[SCSI] bfa: Added firmware save clear feature for BFA driver.
[SCSI] bfa: FCS authentication related changes.
[SCSI] bfa: PCI VPD, FIP and include file changes.
[SCSI] bfa: Fix to copy fpma MAC when requested by user space application.
[SCSI] bfa: RPORT state machine: direct attach mode fix.
...
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 83881dfb33c0..7b75c8a2a49d 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -1948,7 +1948,7 @@ static void sd_read_block_limits(struct scsi_disk *sdkp) | |||
| 1948 | { | 1948 | { |
| 1949 | struct request_queue *q = sdkp->disk->queue; | 1949 | struct request_queue *q = sdkp->disk->queue; |
| 1950 | unsigned int sector_sz = sdkp->device->sector_size; | 1950 | unsigned int sector_sz = sdkp->device->sector_size; |
| 1951 | const int vpd_len = 32; | 1951 | const int vpd_len = 64; |
| 1952 | unsigned char *buffer = kmalloc(vpd_len, GFP_KERNEL); | 1952 | unsigned char *buffer = kmalloc(vpd_len, GFP_KERNEL); |
| 1953 | 1953 | ||
| 1954 | if (!buffer || | 1954 | if (!buffer || |
| @@ -1998,7 +1998,7 @@ static void sd_read_block_characteristics(struct scsi_disk *sdkp) | |||
| 1998 | { | 1998 | { |
| 1999 | unsigned char *buffer; | 1999 | unsigned char *buffer; |
| 2000 | u16 rot; | 2000 | u16 rot; |
| 2001 | const int vpd_len = 32; | 2001 | const int vpd_len = 64; |
| 2002 | 2002 | ||
| 2003 | buffer = kmalloc(vpd_len, GFP_KERNEL); | 2003 | buffer = kmalloc(vpd_len, GFP_KERNEL); |
| 2004 | 2004 | ||