diff --git a/gluster/swift/common/fs_utils.py b/gluster/swift/common/fs_utils.py
index 9f698df..03dff53 100644
--- a/gluster/swift/common/fs_utils.py
+++ b/gluster/swift/common/fs_utils.py
@@ -271,7 +271,7 @@ def do_unlink(path, log=True):
         if err.errno != errno.ENOENT:
             raise GlusterFileSystemOSError(
                 err.errno, '%s, os.unlink("%s")' % (err.strerror, path))
-        elif log:
+        else:
             logging.warn("fs_utils: os.unlink failed on non-existent path: %s",
                          path)
 
diff --git a/gluster/swift/obj/diskfile.py b/gluster/swift/obj/diskfile.py
index 3b9d040..cc677b7 100644
--- a/gluster/swift/obj/diskfile.py
+++ b/gluster/swift/obj/diskfile.py
@@ -429,7 +429,7 @@ class DiskFileWriter(object):
 
         # Avoid the unlink() system call as part of the mkstemp context
         # cleanup
-        self.tmppath = None
+        self._tmppath = None
 
 
 class DiskFileReader(object):
diff --git a/test/unit/obj/test_diskfile.py b/test/unit/obj/test_diskfile.py
index 8ac0244..729bd13 100644
--- a/test/unit/obj/test_diskfile.py
+++ b/test/unit/obj/test_diskfile.py
@@ -946,3 +946,31 @@ class TestDiskFile(unittest.TestCase):
             dw.write("123")
             os.unlink(saved_tmppath)
         assert not os.path.exists(saved_tmppath)
+
+    def test_unlink_not_called_after_rename(self):
+        the_obj_path = os.path.join("b", "a")
+        the_file = os.path.join(the_obj_path, "z")
+        gdf = self._get_diskfile("vol0", "p57", "ufo47", "bar", the_file)
+
+        body = '1234\n'
+        etag = md5(body).hexdigest()
+        metadata = {
+            'X-Timestamp': '1234',
+            'Content-Type': 'file',
+            'ETag': etag,
+            'Content-Length': '5',
+        }
+
+        _mock_do_unlink = Mock()  # Shouldn't be called
+        with patch("gluster.swift.obj.diskfile.do_unlink", _mock_do_unlink):
+            with gdf.create() as dw:
+                assert dw._tmppath is not None
+                tmppath = dw._tmppath
+                dw.write(body)
+                dw.put(metadata)
+                # do_unlink is not called if dw._tmppath is set to None
+                assert dw._tmppath is None
+        self.assertFalse(_mock_do_unlink.called)
+
+        assert os.path.exists(gdf._data_file)  # Real file exists
+        assert not os.path.exists(tmppath)  # Temp file does not exist