From c15454281e8fb8c0ef6230d3a8b0b3499a6e9d67 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Thu, 13 Sep 2012 07:16:25 -0400
Subject: [PATCH] 3.3.0-8, revised fix in 3.3.0-7

---
 ...fs-3.3.0.xlator.mount.fuse.fuse-bridge.c.patch | 15 ---------------
 glusterfs.spec                                    |  7 +++++--
 2 files changed, 5 insertions(+), 17 deletions(-)
 rename glusterfs-3.3.0.xlator.mount.fuse.fuse-bridge.patch => glusterfs-3.3.0.xlator.mount.fuse.fuse-bridge.c.patch (86%)

diff --git a/glusterfs-3.3.0.xlator.mount.fuse.fuse-bridge.patch b/glusterfs-3.3.0.xlator.mount.fuse.fuse-bridge.c.patch
similarity index 86%
rename from glusterfs-3.3.0.xlator.mount.fuse.fuse-bridge.patch
rename to glusterfs-3.3.0.xlator.mount.fuse.fuse-bridge.c.patch
index 5b01185..13fbb58 100644
--- a/glusterfs-3.3.0.xlator.mount.fuse.fuse-bridge.patch
+++ b/glusterfs-3.3.0.xlator.mount.fuse.fuse-bridge.c.patch
@@ -74,18 +74,3 @@
  };
  
  
---- xlators/mount/fuse/src/fuse-bridge.h.orig
-+++ xlators/mount/fuse/src/fuse-bridge.h
-@@ -57,7 +57,11 @@
- #include "syncop.h"
- 
- #if defined(GF_LINUX_HOST_OS) || defined(__NetBSD__)
--#define FUSE_OP_HIGH (FUSE_POLL + 1)
-+#if (FUSE_KERNEL_MINOR_VERSION >= 19)
-+#define FUSE_OP_HIGH (FUSE_FALLOCATE + 1)
-+#else
-+#define FUSE_OP_HIGH 44 /* (FUSE_ALLOCATE + 1) */
-+#endif
- #endif
- #ifdef GF_DARWIN_HOST_OS
- #define FUSE_OP_HIGH (FUSE_DESTROY + 1)
diff --git a/glusterfs.spec b/glusterfs.spec
index 1d7e91c..899f504 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -32,7 +32,7 @@
 Summary:          Cluster File System
 Name:             glusterfs
 Version:          3.3.0
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          GPLv3+ and (GPLv2 or LGPLv3+)
 Group:            System Environment/Base
 Vendor:           Red Hat
@@ -47,7 +47,7 @@ Source6:          glusterfsd.logrotate
 #Patch0:           %{name}-3.2.5.configure.ac.patch
 Patch1:           %{name}-3.3.0.libglusterfs.Makefile.patch
 Patch2:           %{name}-3.3.0.cli.cli-rpc-ops.c.patch
-Patch3:           %{name}-3.3.0.xlator.mount.fuse.fuse-bridge.patch
+Patch3:           %{name}-3.3.0.xlator.mount.fuse.fuse-bridge.c.patch
 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -904,6 +904,9 @@ fi
 
 
 %changelog
+* Wed Sep 13 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-8
+- fix for glusterfs SEGV, BZ 856704, revised
+
 * Wed Sep 12 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-7
 - fix for glusterfs SEGV, BZ 856704