14965: Fixes mkdir name encoding

[arvados.git] / services / fuse / arvados_fuse / __init__.py

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index f944a9197c8449af7431119816da575e20ab480b..dca3d2fd6c8368d4f5d367baf9fafd695d464081 100644 (file)
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -53,12 +53,12 @@ from __future__ import absolute_import
 from __future__ import division
 from future.utils import viewitems
 from future.utils import native
+from future.utils import listvalues
 from future import standard_library
 standard_library.install_aliases()
 from builtins import next
 from builtins import str
 from builtins import object
-from builtins import dict
 import os
 import sys
 import llfuse
@@ -213,7 +213,7 @@ class InodeCache(object):
 
     def cap_cache(self):
         if self._total > self.cap:
-            for ent in self._entries.values():
+            for ent in listvalues(self._entries):
                 if self._total < self.cap or len(self._entries) < self.min_entries:
                     break
                 self._remove(ent, True)
@@ -780,6 +780,7 @@ class Operations(llfuse.Operations):
     @create_time.time()
     @catch_exceptions
     def create(self, inode_parent, name, mode, flags, ctx=None):
+        name = name.decode()
         _logger.debug("arv-mount create: parent_inode %i '%s' %o", inode_parent, name, mode)
 
         p = self._check_writable(inode_parent)
@@ -797,6 +798,7 @@ class Operations(llfuse.Operations):
     @mkdir_time.time()
     @catch_exceptions
     def mkdir(self, inode_parent, name, mode, ctx=None):
+        name = name.decode()
         _logger.debug("arv-mount mkdir: parent_inode %i '%s' %o", inode_parent, name, mode)
 
         p = self._check_writable(inode_parent)
@@ -813,7 +815,7 @@ class Operations(llfuse.Operations):
     def unlink(self, inode_parent, name, ctx=None):
         _logger.debug("arv-mount unlink: parent_inode %i '%s'", inode_parent, name)
         p = self._check_writable(inode_parent)
-        p.unlink(name)
+        p.unlink(name.decode())
 
     @rmdir_time.time()
     @catch_exceptions