Rebase to OpenStack Swift Havana (1.10.0)

Change-Id: I90821230a1a7100c74d97cccc9c445251d0f65e7
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/6157
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/gluster/swift/common/fs_utils.py b/gluster/swift/common/fs_utils.py
index afc0cfe..8b26fd0 100644
--- a/gluster/swift/common/fs_utils.py
+++ b/gluster/swift/common/fs_utils.py
@@ -32,7 +32,7 @@ class Fake_file(object):
         return 0
 
     def read(self, count):
-        return 0
+        return None
 
     def fileno(self):
         return -1
@@ -265,6 +265,14 @@ def do_fsync(fd):
             err.errno, '%s, os.fsync("%s")' % (err.strerror, fd))
 
 
+def do_fdatasync(fd):
+    try:
+        os.fdatasync(fd)
+    except OSError as err:
+        raise GlusterFileSystemOSError(
+            err.errno, '%s, os.fdatasync("%s")' % (err.strerror, fd))
+
+
 def mkdirs(path):
     """
     Ensures the path is a directory or makes it if not. Errors if the path