From 204efab995072c246faa322c9b1337fda88ecfcf Mon Sep 17 00:00:00 2001 From: Peter Portante Date: Mon, 29 Oct 2012 20:51:12 -0400 Subject: object-storage: remove the device and part params Change-Id: I60b4b1b976ad8359ba072d5d0ed6a8dd2087a738 Signed-off-by: Peter Portante Reviewed-on: http://review.gluster.org/4174 Reviewed-by: Kaleb KEITHLEY Reviewed-by: Mohammed Junaid Tested-by: Kaleb KEITHLEY --- swift/1.4.8/plugins/DiskDir.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'swift/1.4.8/plugins/DiskDir.py') diff --git a/swift/1.4.8/plugins/DiskDir.py b/swift/1.4.8/plugins/DiskDir.py index a9e39fd..65845b9 100644 --- a/swift/1.4.8/plugins/DiskDir.py +++ b/swift/1.4.8/plugins/DiskDir.py @@ -140,8 +140,6 @@ class DiskDir(DiskCommon): Manage object files on disk. :param path: path to devices on the node - :param device: device name (unused, ignored) - :param partition: partition on the device the object lives in (unused, ignored) :param account: account name for the object :param container: container name for the object :param logger: account or container server logging object @@ -149,7 +147,7 @@ class DiskDir(DiskCommon): :param gid: group ID container object should assume """ - def __init__(self, path, device, partition, account, container, logger, + def __init__(self, path, account, container, logger, uid=DEFAULT_UID, gid=DEFAULT_GID): self.root = path if container: @@ -422,7 +420,7 @@ class DiskDir(DiskCommon): class DiskAccount(DiskDir): def __init__(self, root, account, logger): - super(DiskAccount, self).__init__(root, None, None, account, None, logger) + super(DiskAccount, self).__init__(root, account, None, logger) assert self.dir_exists def list_containers_iter(self, limit, marker, end_marker, -- cgit