From 702c24d3b29ce4f2f45fb2729c14b311a27c97b4 Mon Sep 17 00:00:00 2001
From: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
Date: Tue, 18 Apr 2017 15:51:14 -0600
Subject: [PATCH] Remove redundant assignments of self._datadir

This is harmless, but honestly annoying. Introduced by the big
ssync change If003dcc6f4109e2d2a42f4873a0779110fff16d6 .

Change-Id: I1a7c0171e03b900ca75da39b152cdffe60abe135
---
 swift/obj/diskfile.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/swift/obj/diskfile.py b/swift/obj/diskfile.py
index fe5fc73804..265756ef64 100644
--- a/swift/obj/diskfile.py
+++ b/swift/obj/diskfile.py
@@ -1932,17 +1932,12 @@ class BaseDiskFile(object):
             self._account = account
             self._container = container
             self._obj = obj
-            name_hash = hash_path(account, container, obj)
-            self._datadir = join(
-                device_path, storage_directory(get_data_dir(policy),
-                                               partition, name_hash))
         else:
             # gets populated when we read the metadata
             self._name = None
             self._account = None
             self._container = None
             self._obj = None
-            self._datadir = None
         self._tmpdir = join(device_path, get_tmp_dir(policy))
         self._ondisk_info = None
         self._metadata = None