From f27878dc50d3963776d7289448e084ccdd5e2c43 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 31 Oct 2016 08:51:31 -0400 Subject: [PATCH] glfs_free(), needed for nfs-ganesha-2.4.1 w/ patched FSAL_GLUSTER --- glusterfs-3.9.0rc2.api.glfs_free.patch | 66 ++++++++++++++++++++++++++ glusterfs.spec | 7 ++- 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 glusterfs-3.9.0rc2.api.glfs_free.patch diff --git a/glusterfs-3.9.0rc2.api.glfs_free.patch b/glusterfs-3.9.0rc2.api.glfs_free.patch new file mode 100644 index 0000000..6f44d88 --- /dev/null +++ b/glusterfs-3.9.0rc2.api.glfs_free.patch @@ -0,0 +1,66 @@ +From 5ab0b43ce67d8d131242542a80b6aa6b129ed5ee Mon Sep 17 00:00:00 2001 +From: Niels de Vos +Date: Mon, 17 Oct 2016 11:58:30 +0200 +Subject: [PATCH] gfapi: add glfs_free() to glfs.h + +Commit 4721188a154acd9a0a4c096d8d73e97f3bf1b2a9 introduces glfs_free() +but missed adding the function to the header. The symbol is correctly +available in the library though. Testcases do not seem to fail when a +function is missing for the headers... + +The glusterfs-3.7.16 packages have been released with the missing +declaration in the header and symbol-maps. Still, the function is +available for applications: + + $ objdump -T usr/lib64/libgfapi.so.0 | grep -w glfs_free + 0000000000006aa0 g DF .text 0000000000000035 GFAPI_3.7.16 glfs_free + +Change-Id: Ia707ee957f090dbfca028192fcc81a83dfdf4ae0 +BUG: 1344714 +Reported-by: Jiffin Tony Thottan +Signed-off-by: Niels de Vos +Reviewed-on: http://review.gluster.org/15653 +CentOS-regression: Gluster Build System +Smoke: Gluster Build System +Reviewed-by: jiffin tony Thottan +NetBSD-regression: NetBSD Build System +--- + +diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases +index 74ef4d3..d2c4ba2 100644 +--- a/api/src/gfapi.aliases ++++ b/api/src/gfapi.aliases +@@ -141,6 +141,7 @@ + + _pub_glfs_h_lookupat _glfs_h_lookupat$GFAPI_3.7.4 + ++_pub_glfs_free _glfs_free$GFAPI_3.7.16 + _pub_glfs_h_poll_upcall _glfs_h_poll_upcall$GFAPI_3.7.16 + _pub_glfs_upcall_get_fs _glfs_upcall_get_fs$GFAPI_3.7.16 + _pub_glfs_upcall_get_reason _glfs_upcall_get_reason$GFAPI_3.7.16 +diff --git a/api/src/gfapi.map b/api/src/gfapi.map +index 964db76..d022380 100644 +--- a/api/src/gfapi.map ++++ b/api/src/gfapi.map +@@ -175,6 +175,7 @@ + + GFAPI_3.7.16 { + global: ++ glfs_free; + glfs_upcall_get_fs; + glfs_upcall_get_reason; + glfs_upcall_inode_get_event; +diff --git a/api/src/glfs.h b/api/src/glfs.h +index c81b7cc..903492a 100644 +--- a/api/src/glfs.h ++++ b/api/src/glfs.h +@@ -769,6 +769,9 @@ + glfs_fd_t *glfs_dup (glfs_fd_t *fd) __THROW + GFAPI_PUBLIC(glfs_dup, 3.4.0); + ++void glfs_free (void *ptr) __THROW ++ GFAPI_PUBLIC(glfs_free, 3.7.16); ++ + /* + * Nobody needs this call at all yet except for the test script. + */ diff --git a/glusterfs.spec b/glusterfs.spec index 3cc6ded..57c029e 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -168,7 +168,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.9.0 -Release: 0.2%{?prereltag:.%{prereltag}}%{?dist} +Release: 0.3%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -190,6 +190,7 @@ Source8: glusterfsd.init Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz %endif Patch0: glusterfs-3.9.0rc2.xlators.crypt.patch +Patch1: glusterfs-3.9.0rc2.api.glfs_free.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -627,6 +628,7 @@ This package provides the glusterfs server daemon. %prep %setup -q -n %{name}-%{version}%{?prereltag} %patch0 -p1 +%patch1 -p1 %build %if ( 0%{?rhel} && 0%{?rhel} < 6 ) @@ -1300,6 +1302,9 @@ exit 0 %endif %changelog +* Mon Oct 31 2016 Kaleb S. KEITHLEY - 3.9.0-0.3rc2 +- glfs_free(), needed for nfs-ganesha-2.4.1 w/ patched FSAL_GLUSTER + * Thu Oct 27 2016 Kaleb S. KEITHLEY - 3.9.0-0.2rc2 - portblock RA (1389293)