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

2.4-dev-25 (revised 32-bit)

This commit is contained in:
Kaleb S. KEITHLEY 2016-07-20 13:18:39 -04:00
parent b10a9fccdc
commit 39fbbf3114
2 changed files with 60 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
nfs-ganesha-2.4dev25-FSAL.patch
View File

@ -1,25 +1,25 @@
--- 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 @@
--- nfs-ganesha-2.4-dev-25/src/CMakeLists.txt.orig 2016-07-20 12:36:17.317803232 -0400
+++ nfs-ganesha-2.4-dev-25/src/CMakeLists.txt 2016-07-20 12:36:36.699803232 -0400
@@ -153,7 +153,7 @@
if (retval == 0) {
LogFullDebug(COMPONENT_FSAL,
- "New size = %"PRIx64,
+ "New size = %ld",
stat.st_size);
} else {
if (errno == EBADF)
if (LINUX)
set(PLATFORM "LINUX")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64")
set(OS_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include/os/linux")
find_library(LIBDL dl) # module loader
endif(LINUX)
--- nfs-ganesha-2.4-dev-25/src/FSAL/fsal_convert.c.orig 2016-07-20 12:38:19.661803232 -0400
+++ nfs-ganesha-2.4-dev-25/src/FSAL/fsal_convert.c 2016-07-20 12:39:21.283803232 -0400
@@ -73,7 +73,7 @@
posix_errorcode);
} else {
LogInfo(COMPONENT_FSAL,
- "Mapping %d to ERR_FSAL_IO, rlim_cur=%ld rlim_max=%ld",
+ "Mapping %d to ERR_FSAL_IO, rlim_cur=%" PRId64 " rlim_max=%" PRId64,
+posix_errorcode,
rlim.rlim_cur,
rlim.rlim_max);
--- 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 @@
@ -40,3 +40,38 @@
lock_args.l_len, request_lock->lock_length);
return fsalstat(ERR_FSAL_BAD_RANGE, 0);
}
--- 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;
if (retval == 0) {
LogFullDebug(COMPONENT_FSAL,
- "New size = %"PRIx64,
+ "New size = %ld",
--- 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-20 13:10:17.789803232 -0400
@@ -435,7 +435,7 @@
if (retval == 0) {
LogFullDebug(COMPONENT_FSAL,
- "New size = %"PRIx64,
+ "New size = %" PRId64,
stat.st_size);
} else {
if (errno == EBADF)
@@ -1285,7 +1285,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(%"
+ "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);

5
nfs-ganesha.spec
View File

@ -76,7 +76,7 @@ Name: nfs-ganesha
Version: 2.4.0
%global dev dev25
%global dash_dev_version 2.4-dev-25
Release: 0.11%{?dev:%{dev}}%{?dist}
Release: 0.12%{?dev:%{dev}}%{?dist}
Summary: NFS-Ganesha is a NFS Server running in user space
Group: Applications/System
License: LGPLv3+
@ -554,6 +554,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
%endif
%changelog
* Wed Jul 20 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.12dev25
- 2.4-dev-25 (revised 32-bit)
* Tue Jul 19 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.11dev25
- 2.4-dev-25