equal
deleted
inserted
replaced
1 In-house supporting volume_dd_blocksize ('1M', 'G') to enable 'dd' to |
1 In-house supporting volume_dd_blocksize ('1M', 'G') to enable 'dd' to |
2 run on Solaris. This patch is Solaris-specific and not suitable for |
2 run on Solaris. This patch is Solaris-specific and not suitable for |
3 upstream. |
3 upstream. |
4 |
4 |
5 --- cinder-2015.1.2/cinder/volume/utils.py.orig 2015-11-17 18:29:59.168650488 -0800 |
5 --- cinder-8.0.0/cinder/volume/utils.py.~2~ 2016-06-10 14:42:55.143866680 -0700 |
6 +++ cinder-2015.1.2/cinder/volume/utils.py 2015-11-17 18:30:21.197972544 -0800 |
6 +++ cinder-8.0.0/cinder/volume/utils.py 2016-06-10 14:42:55.188129865 -0700 |
7 @@ -267,6 +267,7 @@ |
7 @@ -291,6 +291,7 @@ def _calculate_count(size_in_m, blocksiz |
8 bs = strutils.string_to_bytes('%sB' % blocksize) |
8 bs = strutils.string_to_bytes('%sB' % blocksize) |
9 |
9 |
10 count = math.ceil(size_in_m * units.Mi / bs) |
10 count = math.ceil(size_in_m * units.Mi / bs) |
11 + blocksize = int(bs) |
11 + blocksize = int(bs) |
12 |
12 |