[vdsm/f17] update to vdsm-4.10.0-10

[Federico Simoncelli]

commit 53d7f88fbd8342b6acf6af3774f2bf9d0b21a26d
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Thu Oct 4 22:37:01 2012 +0200

    update to vdsm-4.10.0-10
    
    - BZ#845660 Use buffer size in multiplies of the recommended
      transfer size
    
    Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>

 ...size-in-multiplies-of-the-recommended-tra.patch |   50 ++++++++++++++++++++
 vdsm.spec                                          |    7 ++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/0044-Use-buffer-size-in-multiplies-of-the-recommended-tra.patch b/0044-Use-buffer-size-in-multiplies-of-the-recommended-tra.patch
new file mode 100644
index 0000000..edcbaae
--- /dev/null
+++ b/0044-Use-buffer-size-in-multiplies-of-the-recommended-tra.patch
@@ -0,0 +1,50 @@
+From c219c4455bb93d9f136849b58ceb0255e407fdbe Mon Sep 17 00:00:00 2001
+From: Saggi Mizrahi <smizrahi at redhat.com>
+Date: Thu, 4 Oct 2012 13:14:21 +0200
+Subject: [PATCH] Use buffer size in multiplies of the recommended transfer
+ size
+
+Using the recommended transfer size fixes the memory corruption for NFS.
+
+Bug-Id: http://bugzilla.redhat.com/845660
+Change-Id: Iadea310039b30073197b7ad90afb930c460bda17
+Signed-off-by: Saggi Mizrahi <smizrahi at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/8356
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+Tested-by: Jason Brooks <jbrooks at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/8369
+Reviewed-by: Federico Simoncelli <fsimonce at redhat.com>
+Tested-by: Federico Simoncelli <fsimonce at redhat.com>
+---
+ vdsm/storage/fileUtils.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/vdsm/storage/fileUtils.py b/vdsm/storage/fileUtils.py
+index 511dff9..ccc2bfe 100644
+--- a/vdsm/storage/fileUtils.py
++++ b/vdsm/storage/fileUtils.py
+@@ -48,6 +48,7 @@ log = logging.getLogger('fileUtils')
+ CharPointer = ctypes.POINTER(ctypes.c_char)
+ 
+ _PC_REC_XFER_ALIGN = 17
++_PC_REC_MIN_XFER_SIZE = 16
+ 
+ class TarCopyFailed(RuntimeError): pass
+ 
+@@ -265,6 +266,13 @@ class DirectFile(object):
+         # Because we usually have fixed sizes for our reads, caching
+         # buffers might give a slight performance boost.
+         alignment = libc.fpathconf(self.fileno(), _PC_REC_XFER_ALIGN)
++        minXferSize = libc.fpathconf(self.fileno(), _PC_REC_MIN_XFER_SIZE)
++        chunks, remainder = divmod(size, minXferSize)
++        if remainder > 0:
++            chunks += 1
++
++        size = chunks * minXferSize
++
+         rc = libc.posix_memalign(ppbuff, alignment, size)
+         if rc:
+             raise OSError(rc, "Could not allocate aligned buffer")
+-- 
+1.7.11.4
+
diff --git a/vdsm.spec b/vdsm.spec
index b9c02ec..53d5aef 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -28,7 +28,7 @@
 
 Name:           %{vdsm_name}
 Version:        4.10.0
-Release:        9%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Release:        10%{?vdsm_relvtag}%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -86,6 +86,7 @@ Patch39: 0040-configNet-atomicBackup-remove-new-files-upon-restore.patch
 Patch40: 0041-BZ-842948-deployUtil-safely-remove-bridge.patch
 Patch41: 0042-Ship-the-version-file-with-the-tarballs.patch
 Patch42: 0043-Use-the-recommended-alignment-instead-of-using-pages.patch
+Patch43: 0044-Use-buffer-size-in-multiplies-of-the-recommended-tra.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -431,6 +432,7 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 %patch41 -p1 -b .patch41
 %{__chmod} +x build-aux/pkg-version  # required by patch41
 %patch42 -p1 -b .patch42
+%patch43 -p1 -b .patch43
 
 %build
 %if 0%{?enable_autotools}
@@ -994,6 +996,9 @@ exit 0
 %{_datadir}/%{vdsm_name}/gluster/hostname.py*
 
 %changelog
+* Thu Oct  4 2012 Federico Simoncelli <fsimonce at redhat.com> 4.10.0-10.fc17
+- BZ#845660 Use buffer size in multiplies of the recommended transfer size
+
 * Mon Sep 24 2012 Federico Simoncelli <fsimonce at redhat.com> 4.10.0-9.fc17
 - BZ#845660 Use the recommended alignment instead of using pagesize