rpms/glusterfs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

3.8.0 GA, http://review.gluster.org/#/c/14779/

Browse Source
This commit is contained in:
Kaleb S KEITHLEY 2016-06-27 08:55:16 -04:00
parent d3513ee46c
commit 8ea67ac2c9
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
glusterfs-3.8.0.api.glfs-fops.patch Normal file
View File

@ -0,0 +1,23 @@
--- glusterfs-3.8.0/api/src/glfs-fops.c.orig 2016-06-27 08:38:37.523161014 -0400
+++ glusterfs-3.8.0/api/src/glfs-fops.c 2016-06-27 08:40:06.591161014 -0400
@@ -803,7 +803,6 @@
GF_VALIDATE_OR_GOTO ("gfapi", frame, inval);
GF_VALIDATE_OR_GOTO ("gfapi", cookie, inval);
- GF_VALIDATE_OR_GOTO ("gfapi", iovec, inval);
gio = frame->local;
frame->local = NULL;
@@ -817,6 +816,12 @@
if (op_ret <= 0) {
goto out;
} else if (gio->op == GF_FOP_READ) {
+ if (!iovec) {
+ op_ret = -1;
+ op_errno = EINVAL;
+ goto out;
+ }
+
op_ret = iov_copy (gio->iov, gio->count, iovec, count);
glfd->offset = gio->offset + op_ret;
} else if (gio->op == GF_FOP_WRITE) {

7
glusterfs.spec
View File

@ -161,7 +161,7 @@ Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs Name: glusterfs
Version: 3.8.0 Version: 3.8.0
Release: 2%{?prereltag:.%{prereltag}}%{?dist} Release: 3%{?prereltag:.%{prereltag}}%{?dist}
Vendor: Fedora Project Vendor: Fedora Project
%else %else
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
@ -182,6 +182,7 @@ Source8: glusterfsd.init
%else %else
Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
%endif %endif
Patch0: glusterfs-3.8.0.api.glfs-fops.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@ -587,6 +588,7 @@ This package provides the glusterfs server daemon.
%prep %prep
%setup -q -n %{name}-%{version}%{?prereltag} %setup -q -n %{name}-%{version}%{?prereltag}
%patch0 -p1
%build %build
%if ( 0%{?rhel} && 0%{?rhel} < 6 ) %if ( 0%{?rhel} && 0%{?rhel} < 6 )
@ -1206,6 +1208,9 @@ exit 0
%endif %endif
%changelog %changelog
* Mon Jun 27 2016 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.8.0-3
- 3.8.0 GA, http://review.gluster.org/#/c/14779/
* Wed Jun 22 2016 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.8.0-2 * Wed Jun 22 2016 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.8.0-2
- 3.8.0 GA, rebuild after userspace-rcu SONAME bump - 3.8.0 GA, rebuild after userspace-rcu SONAME bump