rpms/nfs-ganesha
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into f24

Browse Source
This commit is contained in:
Kaleb S. KEITHLEY 2016-07-19 11:56:12 -04:00
commit b10a9fccdc
3 changed files with 54 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nfs-ganesha-2.4dev25-FSAL.patch Normal file
View File

@ -0,0 +1,42 @@
--- nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_PSEUDO/handle.c.orig 2016-07-19 09:52:43.912803232 -0400
+++ nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_PSEUDO/handle.c 2016-07-19 09:54:56.309803232 -0400
@@ -315,7 +315,7 @@
struct fsal_obj_handle **handle,
struct attrlist *attrs_out)
{
- struct pseudo_fsal_obj_handle *myself, *hdl;
+ struct pseudo_fsal_obj_handle *myself, *hdl = NULL;
struct pseudo_fsal_obj_handle key[1];
struct avltree_node *node;
fsal_errors_t error = ERR_FSAL_NOENT;
--- nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_VFS/file.c.orig 2016-07-19 10:05:16.657803232 -0400
+++ nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_VFS/file.c 2016-07-19 10:19:24.847803232 -0400
@@ -435,7 +435,7 @@
if (retval == 0) {
LogFullDebug(COMPONENT_FSAL,
- "New size = %"PRIx64,
+ "New size = %ld",
stat.st_size);
} else {
if (errno == EBADF)
--- nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_GLUSTER/handle.c.orig 2016-07-19 10:49:48.109803232 -0400
+++ nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_GLUSTER/handle.c 2016-07-19 10:54:46.075803232 -0400
@@ -2255,7 +2255,7 @@
#endif
LogFullDebug(COMPONENT_FSAL,
- "Locking: op:%d type:%d start:%" PRIu64 " length:%lu ",
+ "Locking: op(%d) type(%d) start(%" PRIu64 ") length(%" PRIu64 ")",
lock_op, request_lock->lock_type, request_lock->lock_start,
request_lock->lock_length);
@@ -2310,7 +2310,7 @@
*/
if (lock_args.l_len < 0) {
LogCrit(COMPONENT_FSAL,
- "The requested lock length is out of range- lock_args.l_len(%ld), request_lock_length(%lu)",
+ "The requested lock length is out of range: lock_args.l_len(%" PRId64 "), request_lock_length(%" PRIu64 ")",
lock_args.l_len, request_lock->lock_length);
return fsalstat(ERR_FSAL_BAD_RANGE, 0);
}

16
nfs-ganesha.spec
View File

@ -74,16 +74,16 @@ Requires: sles-release >= 12
Name: nfs-ganesha
Version: 2.4.0
%global dev dev23
%global dash_dev_version 2.4-dev-23
Release: 0.9%{?dev:%{dev}}%{?dist}
%global dev dev25
%global dash_dev_version 2.4-dev-25
Release: 0.11%{?dev:%{dev}}%{?dist}
Summary: NFS-Ganesha is a NFS Server running in user space
Group: Applications/System
License: LGPLv3+
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
#Patch0: nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch
Patch0: nfs-ganesha-2.4dev25-FSAL.patch
BuildRequires: cmake
@ -302,8 +302,8 @@ be used with NFS-Ganesha to support Gluster
%prep
%setup -q -n %{name}-%{dash_dev_version}
%patch0 -p1
rm -rf contrib/libzfswrapper
# %%patch0 -p1
%build
cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \
@ -554,6 +554,12 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
%endif
%changelog
* Tue Jul 19 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.11dev25
- 2.4-dev-25
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.0-0.10dev23
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Tue Jul 5 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.9dev23
- 2.4-dev-23

3
sources
View File

@ -1,2 +1 @@
3aac1106799e48e65e4e332c8ad676bb nfs-ganesha-2.4-dev-21.tar.gz
409689331d387e876bb6ad23a7a964a5 nfs-ganesha-2.4-dev-23.tar.gz
6931a5ccdb077287228cfacd0465aef1 nfs-ganesha-2.4-dev-25.tar.gz