From c7c6606da65e53a0b0c4b1901ca4774dc016c949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Wed, 4 Apr 2012 14:19:53 +0200
Subject: [PATCH] bdev: Take the params directly from disk without refill
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/bdev.py | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/lib/bdev.py b/lib/bdev.py
index ee312204e..452e51005 100644
--- a/lib/bdev.py
+++ b/lib/bdev.py
@@ -2667,10 +2667,8 @@ def FindDevice(disk, children):
"""
_VerifyDiskType(disk.dev_type)
- dev_params = objects.FillDict(constants.DISK_LD_DEFAULTS[disk.dev_type],
- disk.params)
device = DEV_MAP[disk.dev_type](disk.physical_id, children, disk.size,
- dev_params)
+ disk.params)
if not device.attached:
return None
return device
@@ -2690,10 +2688,8 @@ def Assemble(disk, children):
"""
_VerifyDiskType(disk.dev_type)
- dev_params = objects.FillDict(constants.DISK_LD_DEFAULTS[disk.dev_type],
- disk.params)
device = DEV_MAP[disk.dev_type](disk.physical_id, children, disk.size,
- dev_params)
+ disk.params)
device.Assemble()
return device
@@ -2709,8 +2705,6 @@ def Create(disk, children):
"""
_VerifyDiskType(disk.dev_type)
- dev_params = objects.FillDict(constants.DISK_LD_DEFAULTS[disk.dev_type],
- disk.params)
device = DEV_MAP[disk.dev_type].Create(disk.physical_id, children, disk.size,
- dev_params)
+ disk.params)
return device
--
GitLab