diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
| commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
| tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /drivers/md/dm-table.c | |
| parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
| parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/md/dm-table.c')
| -rw-r--r-- | drivers/md/dm-table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index a6f2dc66c3db..9b1e2f5ca630 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c | |||
| @@ -508,7 +508,7 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start, | |||
| 508 | if (q->merge_bvec_fn) | 508 | if (q->merge_bvec_fn) |
| 509 | rs->max_sectors = | 509 | rs->max_sectors = |
| 510 | min_not_zero(rs->max_sectors, | 510 | min_not_zero(rs->max_sectors, |
| 511 | (unsigned short)(PAGE_SIZE >> 9)); | 511 | (unsigned int) (PAGE_SIZE >> 9)); |
| 512 | 512 | ||
| 513 | rs->max_phys_segments = | 513 | rs->max_phys_segments = |
| 514 | min_not_zero(rs->max_phys_segments, | 514 | min_not_zero(rs->max_phys_segments, |