diff options
| author | Or Gerlitz <ogerlitz@mellanox.com> | 2011-08-01 17:12:09 -0400 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2011-08-17 12:40:55 -0400 |
| commit | 0ace64b85ea7b90e3bffe408b9d7c3364692bfa4 (patch) | |
| tree | 2606a343505441fe0c1f4cf638c6ebc9bb9929b5 /drivers | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
IBiser: Fix wrong mask when sizeof (dma_addr_t) > sizeof (unsigned long)
The code that prepares the SG associated with SCSI command for FMR was
buggy for systems with DMA addresses that don't fit in unsigned long,
e.g under the 32-bit based XenServer dom0 sizeof(dma_addr_t) is 8.
Fix that by casting to unsigned long long a masking constant used by
the code. This resolves a crash in iser_sg_to_page_vec on this system.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h index 342cbc1bdaae..db6f3ce9f3bf 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.h +++ b/drivers/infiniband/ulp/iser/iscsi_iser.h | |||
| @@ -89,7 +89,7 @@ | |||
| 89 | } while (0) | 89 | } while (0) |
| 90 | 90 | ||
| 91 | #define SHIFT_4K 12 | 91 | #define SHIFT_4K 12 |
| 92 | #define SIZE_4K (1UL << SHIFT_4K) | 92 | #define SIZE_4K (1ULL << SHIFT_4K) |
| 93 | #define MASK_4K (~(SIZE_4K-1)) | 93 | #define MASK_4K (~(SIZE_4K-1)) |
| 94 | 94 | ||
| 95 | /* support up to 512KB in one RDMA */ | 95 | /* support up to 512KB in one RDMA */ |