From e33d052261a4b8ed90f209ca9a8d38edf5effc34 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 18 Jan 2017 13:26:06 -0500 Subject: [PATCH] python2 (vs python3) cleanup and delete obsolete patches --- nfs-ganesha-2.0.0-dirent.patch | 91 --- nfs-ganesha-2.0.0-fsal_ceph.patch | 18 - nfs-ganesha-2.0.0-lustre-strict.patch | 12 - nfs-ganesha-2.0.0-no-strict-aliasing.patch | 12 - nfs-ganesha-2.0.0rc5.patch | 26 - nfs-ganesha-2.1.0-cache_inode.patch | 19 - nfs-ganesha-2.1.0-cache_inode_getattr.patch | 19 - nfs-ganesha-2.1.0-commonlib.patch | 19 - nfs-ganesha-2.1.0-config-h.in.cmake.patch | 19 - nfs-ganesha-2.1.0-config_parsing.patch | 44 -- nfs-ganesha-2.1.0-nfs4_op_secinfo.patch | 19 - nfs-ganesha-2.1.0-nfs4_pseudo.patch | 23 - nfs-ganesha-2.1.0-state_lock.patch | 21 - ...ganesha-2.1.0-support-CMakeLists.txt.patch | 19 - nfs-ganesha-2.2.0-CMakeLists.txt.patch | 69 -- nfs-ganesha-2.3rc1-jumbo.patch | 684 ------------------ nfs-ganesha-2.3rc2-jumbo.patch | 684 ------------------ nfs-ganesha-2.3rc3-CMakeLists.txt.patch | 62 -- ...c3-scripts-ganeshactl-CMakeLists.txt.patch | 10 - nfs-ganesha-2.3rc4-CMakeLists.txt.patch | 62 -- nfs-ganesha-2.3rc5-CMakeLists.txt.patch | 20 - ...sha-2.3rc5-include-config-h.in.cmake.patch | 11 - ...c5-scripts-ganeshactl-CMakeLists.txt.patch | 10 - nfs-ganesha-2.4dev12-include-nfsv41.patch | 31 - nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch | 11 - ...nesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch | 11 - nfs-ganesha-2.4dev25-FSAL.patch | 77 -- nfs-ganesha-2.4dev29-FSAL.patch | 50 -- ...ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch | 34 - nfs-ganesha-2.4dev7-RPCAL-rpc_tools.patch | 13 - nfs-ganesha-2.4dev7-SAL-9p_owner.patch | 11 - nfs-ganesha-2.4rc1-FSAL.patch | 20 - nfs-ganesha-2.4rc3-FSAL_RGW.handle.patch | 70 -- nfs-ganesha.spec | 9 +- 34 files changed, 6 insertions(+), 2304 deletions(-) delete mode 100644 nfs-ganesha-2.0.0-dirent.patch delete mode 100644 nfs-ganesha-2.0.0-fsal_ceph.patch delete mode 100644 nfs-ganesha-2.0.0-lustre-strict.patch delete mode 100644 nfs-ganesha-2.0.0-no-strict-aliasing.patch delete mode 100644 nfs-ganesha-2.0.0rc5.patch delete mode 100644 nfs-ganesha-2.1.0-cache_inode.patch delete mode 100644 nfs-ganesha-2.1.0-cache_inode_getattr.patch delete mode 100644 nfs-ganesha-2.1.0-commonlib.patch delete mode 100644 nfs-ganesha-2.1.0-config-h.in.cmake.patch delete mode 100644 nfs-ganesha-2.1.0-config_parsing.patch delete mode 100644 nfs-ganesha-2.1.0-nfs4_op_secinfo.patch delete mode 100644 nfs-ganesha-2.1.0-nfs4_pseudo.patch delete mode 100644 nfs-ganesha-2.1.0-state_lock.patch delete mode 100644 nfs-ganesha-2.1.0-support-CMakeLists.txt.patch delete mode 100644 nfs-ganesha-2.2.0-CMakeLists.txt.patch delete mode 100644 nfs-ganesha-2.3rc1-jumbo.patch delete mode 100644 nfs-ganesha-2.3rc2-jumbo.patch delete mode 100644 nfs-ganesha-2.3rc3-CMakeLists.txt.patch delete mode 100644 nfs-ganesha-2.3rc3-scripts-ganeshactl-CMakeLists.txt.patch delete mode 100644 nfs-ganesha-2.3rc4-CMakeLists.txt.patch delete mode 100644 nfs-ganesha-2.3rc5-CMakeLists.txt.patch delete mode 100644 nfs-ganesha-2.3rc5-include-config-h.in.cmake.patch delete mode 100644 nfs-ganesha-2.3rc5-scripts-ganeshactl-CMakeLists.txt.patch delete mode 100644 nfs-ganesha-2.4dev12-include-nfsv41.patch delete mode 100644 nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch delete mode 100644 nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch delete mode 100644 nfs-ganesha-2.4dev25-FSAL.patch delete mode 100644 nfs-ganesha-2.4dev29-FSAL.patch delete mode 100644 nfs-ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch delete mode 100644 nfs-ganesha-2.4dev7-RPCAL-rpc_tools.patch delete mode 100644 nfs-ganesha-2.4dev7-SAL-9p_owner.patch delete mode 100644 nfs-ganesha-2.4rc1-FSAL.patch delete mode 100644 nfs-ganesha-2.4rc3-FSAL_RGW.handle.patch diff --git a/nfs-ganesha-2.0.0-dirent.patch b/nfs-ganesha-2.0.0-dirent.patch deleted file mode 100644 index ff4800d..0000000 --- a/nfs-ganesha-2.0.0-dirent.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- nfs-ganesha-2.0.0/src/CMakeLists.txt.orig 2014-05-20 13:58:50.685211144 -0400 -+++ nfs-ganesha-2.0.0/src/CMakeLists.txt 2014-05-20 14:00:24.825924703 -0400 -@@ -125,6 +125,7 @@ - - if (LINUX) - set(PLATFORM "LINUX") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE64_SOURCE") - set(OS_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include/os/linux") - find_library(LIBDL dl) # module loader - endif(LINUX) ---- nfs-ganesha-2.0.0/src/os/linux/subr.c.orig 2014-05-20 14:02:56.340987294 -0400 -+++ nfs-ganesha-2.0.0/src/os/linux/subr.c 2014-05-20 14:03:41.196565516 -0400 -@@ -34,6 +34,7 @@ - #include - #include "os/subr.h" - -+#ifdef NOT_TRUE - /* not defined in linux headers so we do it here - */ - struct linux_dirent { -@@ -50,6 +51,7 @@ - // offset is (d_reclen - 1)) - */ - }; -+#endif - - /** - * @brief Read system directory entries into the buffer -@@ -63,7 +65,7 @@ - { - int retval = 0; - -- retval = syscall(SYS_getdents, fd, buf, bcount); -+ retval = syscall(SYS_getdents64, fd, buf, bcount); - if (retval >= 0) - *basepp += retval; - return retval; -@@ -82,7 +84,7 @@ - - bool to_vfs_dirent(char *buf, int bpos, struct vfs_dirent *vd, off_t base) - { -- struct linux_dirent *dp = (struct linux_dirent *)(buf + bpos); -+ struct dirent64 *dp = (struct dirent64 *)(buf + bpos); - char type; - - vd->vd_ino = dp->d_ino; ---- nfs-ganesha-2.0.0/src/FSAL/FSAL_GPFS/handle.c.orig 2014-05-20 14:30:03.880250822 -0400 -+++ nfs-ganesha-2.0.0/src/FSAL/FSAL_GPFS/handle.c 2014-05-20 14:31:41.470619655 -0400 -@@ -438,6 +438,7 @@ - return status; - } - -+#ifdef NOT_TRUE - /* not defined in linux headers so we do it here - */ - -@@ -455,6 +456,7 @@ - // offset is (d_reclen - 1)) - */ - }; -+#endif - - #define BUF_SIZE 1024 - /** -@@ -480,7 +482,7 @@ - fsal_status_t status; - off_t seekloc = 0; - int bpos, cnt, nread; -- struct linux_dirent *dentry; -+ struct dirent64 *dentry; - char buf[BUF_SIZE]; - - if (whence != NULL) -@@ -502,7 +504,7 @@ - } - cnt = 0; - do { -- nread = syscall(SYS_getdents, dirfd, buf, BUF_SIZE); -+ nread = syscall(SYS_getdents64, dirfd, buf, BUF_SIZE); - if (nread < 0) { - retval = errno; - fsal_error = posix2fsal_error(retval); -@@ -511,7 +513,7 @@ - if (nread == 0) - break; - for (bpos = 0; bpos < nread;) { -- dentry = (struct linux_dirent *)(buf + bpos); -+ dentry = (struct dirent64 *)(buf + bpos); - if (strcmp(dentry->d_name, ".") == 0 - || strcmp(dentry->d_name, "..") == 0) - goto skip; /* must skip '.' and '..' */ diff --git a/nfs-ganesha-2.0.0-fsal_ceph.patch b/nfs-ganesha-2.0.0-fsal_ceph.patch deleted file mode 100644 index c64fdc3..0000000 --- a/nfs-ganesha-2.0.0-fsal_ceph.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- nfs-ganesha-2.0.0/src/FSAL/FSAL_CEPH/handle.c.orig 2014-06-02 01:49:21.711983531 -0400 -+++ nfs-ganesha-2.0.0/src/FSAL/FSAL_CEPH/handle.c 2014-06-02 01:50:57.119983531 -0400 -@@ -374,12 +374,13 @@ - /* The private 'full' directory handle */ - struct handle *link = container_of(link_pub, struct handle, handle); - /* Pointer to the Ceph link content */ -- char *content = NULL; -+ char content[4096] = {0,}; - - /* Content points into a static buffer in the Ceph client's - cache, so we don't have to free it. */ - -- rc = ceph_ll_readlink(export->cmount, link->i, &content, 0, 0); -+ rc = ceph_ll_readlink(export->cmount, link->i, -+ content, sizeof content, 0, 0); - - if (rc < 0) - return ceph2fsal_error(rc); diff --git a/nfs-ganesha-2.0.0-lustre-strict.patch b/nfs-ganesha-2.0.0-lustre-strict.patch deleted file mode 100644 index 6387ede..0000000 --- a/nfs-ganesha-2.0.0-lustre-strict.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h.lustre-strict nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h ---- nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h.lustre-strict 2013-12-10 16:01:48.823633927 -0800 -+++ nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h 2013-12-10 16:02:38.036661006 -0800 -@@ -109,7 +109,7 @@ static inline int lustre_name_to_handle_ - struct lustre_file_handle - *out_handle, int flags) - { -- char path[MAXPATHLEN]; -+ char path[MAXPATHLEN + 2]; - - if (!mntpath || !at_handle || !name || !out_handle) - return -1; diff --git a/nfs-ganesha-2.0.0-no-strict-aliasing.patch b/nfs-ganesha-2.0.0-no-strict-aliasing.patch deleted file mode 100644 index e3925f9..0000000 --- a/nfs-ganesha-2.0.0-no-strict-aliasing.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** nfs-ganesha-2.0.0/src/CMakeLists.txt.orig 2013-12-11 12:46:24.587001058 -0500 ---- nfs-ganesha-2.0.0/src/CMakeLists.txt 2013-12-11 12:47:27.314999423 -0500 -*************** -*** 34,39 **** ---- 34,40 ---- - - # find out which platform we are building on - if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-strict-aliasing") - set(LINUX ON) - set(UNIX ON) - # Now detects the Linux's distro diff --git a/nfs-ganesha-2.0.0rc5.patch b/nfs-ganesha-2.0.0rc5.patch deleted file mode 100644 index 9fdf828..0000000 --- a/nfs-ganesha-2.0.0rc5.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- nfs-ganesha-pre-2.0-RC3/src/os/linux/subr.c.orig 2013-11-04 13:17:41.284000000 -0500 -+++ nfs-ganesha-pre-2.0-RC3/src/os/linux/subr.c 2013-11-04 13:31:05.496000000 -0500 -@@ -127,7 +127,6 @@ - { - uid_t orig_uid = setfsuid(uid); - if (uid != setfsuid(uid)) { -- setfsuid(orig_uid); - LogCrit(COMPONENT_FSAL, "Could not set user identity"); - } - return orig_uid; -@@ -137,7 +136,6 @@ - { - gid_t orig_gid = setfsgid(gid); - if (gid != setfsgid(gid)) { -- setfsgid(orig_gid); - LogCrit(COMPONENT_FSAL, "Could not set group identity"); - } - return orig_gid; ---- nfs-ganesha-pre-2.0-RC3/src/tools/ganestat.pl.orig 2013-11-04 16:46:40.414916999 -0500 -+++ nfs-ganesha-pre-2.0-RC3/src/tools/ganestat.pl 2013-11-04 16:47:09.108916999 -0500 -@@ -1,4 +1,4 @@ --#!/bin/env perl -+#!/usr/bin/perl - # - ################## Doxygen header ################## - #* diff --git a/nfs-ganesha-2.1.0-cache_inode.patch b/nfs-ganesha-2.1.0-cache_inode.patch deleted file mode 100644 index 33c3d3f..0000000 --- a/nfs-ganesha-2.1.0-cache_inode.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** nfs-ganesha-2.1.0/src/include/cache_inode.h.orig 2015-02-12 11:12:22.218718318 -0500 ---- nfs-ganesha-2.1.0/src/include/cache_inode.h 2015-02-12 11:12:37.967718318 -0500 -*************** -*** 879,885 **** - cache_inode_status_t cache_inode_invalidate(cache_entry_t *entry, - uint32_t flags); - -! inline int cache_inode_set_time_current(struct timespec *time); - - void cache_inode_destroyer(void); - ---- 879,885 ---- - cache_inode_status_t cache_inode_invalidate(cache_entry_t *entry, - uint32_t flags); - -! int cache_inode_set_time_current(struct timespec *time); - - void cache_inode_destroyer(void); - diff --git a/nfs-ganesha-2.1.0-cache_inode_getattr.patch b/nfs-ganesha-2.1.0-cache_inode_getattr.patch deleted file mode 100644 index 7c1e843..0000000 --- a/nfs-ganesha-2.1.0-cache_inode_getattr.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** nfs-ganesha-2.1.0/src/cache_inode/cache_inode_getattr.c.orig 2014-06-27 10:06:09.273133273 -0400 ---- nfs-ganesha-2.1.0/src/cache_inode/cache_inode_getattr.c 2014-06-27 10:06:45.677133273 -0400 -*************** -*** 71,77 **** - cache_inode_getattr_cb_t cb) - { - cache_inode_status_t status; -! struct gsh_export *junction_export; - cache_entry_t *junction_entry; - uint64_t mounted_on_fileid; - ---- 71,77 ---- - cache_inode_getattr_cb_t cb) - { - cache_inode_status_t status; -! struct gsh_export *junction_export = NULL; - cache_entry_t *junction_entry; - uint64_t mounted_on_fileid; - diff --git a/nfs-ganesha-2.1.0-commonlib.patch b/nfs-ganesha-2.1.0-commonlib.patch deleted file mode 100644 index 9bf75df..0000000 --- a/nfs-ganesha-2.1.0-commonlib.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** nfs-ganesha-2.1.0/src/FSAL/commonlib.c.orig 2014-06-27 14:08:23.118133273 -0400 ---- nfs-ganesha-2.1.0/src/FSAL/commonlib.c 2014-06-27 14:09:12.677133273 -0400 -*************** -*** 752,758 **** - int change_fsid_type(struct fsal_filesystem *fs, - enum fsid_type fsid_type) - { -! uint64_t major, minor; - bool valid = false; - - if (fs->fsid_type == fsid_type) ---- 752,758 ---- - int change_fsid_type(struct fsal_filesystem *fs, - enum fsid_type fsid_type) - { -! uint64_t major = 0, minor = 0; - bool valid = false; - - if (fs->fsid_type == fsid_type) diff --git a/nfs-ganesha-2.1.0-config-h.in.cmake.patch b/nfs-ganesha-2.1.0-config-h.in.cmake.patch deleted file mode 100644 index 5958924..0000000 --- a/nfs-ganesha-2.1.0-config-h.in.cmake.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** nfs-ganesha-2.1.0/src/include/config-h.in.cmake.orig 2014-06-27 11:38:56.845133273 -0400 ---- nfs-ganesha-2.1.0/src/include/config-h.in.cmake 2014-06-27 11:39:09.294133273 -0400 -*************** -*** 14,20 **** - #define _GIT_HEAD_COMMIT "@_GIT_HEAD_COMMIT@" - #define _GIT_DESCRIBE "@_GIT_DESCRIBE@" - #define BUILD_HOST "@BUILD_HOST_NAME@" -! #define FSAL_MODULE_LOC "@MODULES_PATH@/@FSAL_DESTINATION@" - /* Build controls */ - - #cmakedefine _MSPAC_SUPPORT 1 ---- 14,20 ---- - #define _GIT_HEAD_COMMIT "@_GIT_HEAD_COMMIT@" - #define _GIT_DESCRIBE "@_GIT_DESCRIBE@" - #define BUILD_HOST "@BUILD_HOST_NAME@" -! #define FSAL_MODULE_LOC "/usr/@FSAL_DESTINATION@" - /* Build controls */ - - #cmakedefine _MSPAC_SUPPORT 1 diff --git a/nfs-ganesha-2.1.0-config_parsing.patch b/nfs-ganesha-2.1.0-config_parsing.patch deleted file mode 100644 index f4b5633..0000000 --- a/nfs-ganesha-2.1.0-config_parsing.patch +++ /dev/null @@ -1,44 +0,0 @@ -*** nfs-ganesha-2.1.0/src/config_parsing/config_parsing.c.orig 2014-06-27 07:42:33.850133273 -0400 ---- nfs-ganesha-2.1.0/src/config_parsing/config_parsing.c 2014-06-27 09:59:59.758133273 -0400 -*************** -*** 1567,1573 **** - struct config_node *sub_node; - struct config_node *top; - struct expr_parse *expr, *expr_head; -! struct config_node_list *list = NULL, *list_tail; - char *ep; - int rc = EINVAL; - bool found = false; ---- 1567,1573 ---- - struct config_node *sub_node; - struct config_node *top; - struct expr_parse *expr, *expr_head; -! struct config_node_list *list = NULL, *list_tail = NULL; - char *ep; - int rc = EINVAL; - bool found = false; -*************** -*** 1599,1607 **** - list->tree_node = sub_node; - if (*node_list == NULL) - *node_list = list; -! else - list_tail->next = list; -! list_tail = list; - found = true; - } - } ---- 1599,1611 ---- - list->tree_node = sub_node; - if (*node_list == NULL) - *node_list = list; -! else if (list_tail != NULL) - list_tail->next = list; -! else { -! for (list_tail = (*node_list)->next; -! list_tail->next != NULL; ) -! list_tail = list_tail->next; -! } - found = true; - } - } diff --git a/nfs-ganesha-2.1.0-nfs4_op_secinfo.patch b/nfs-ganesha-2.1.0-nfs4_op_secinfo.patch deleted file mode 100644 index 99f552e..0000000 --- a/nfs-ganesha-2.1.0-nfs4_op_secinfo.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** nfs-ganesha-2.1.0/src/Protocols/NFS/nfs4_op_secinfo.c.orig 2014-06-30 07:54:56.787133273 -0400 ---- nfs-ganesha-2.1.0/src/Protocols/NFS/nfs4_op_secinfo.c 2014-06-30 07:55:58.190133273 -0400 -*************** -*** 65,71 **** - cache_entry_t *entry_src = NULL; - sec_oid4 v5oid = { krb5oid.length, (char *)krb5oid.elements }; - int num_entry = 0; -! struct export_perms save_export_perms; - struct gsh_export *saved_gsh_export = NULL; - - resp->resop = NFS4_OP_SECINFO; ---- 65,71 ---- - cache_entry_t *entry_src = NULL; - sec_oid4 v5oid = { krb5oid.length, (char *)krb5oid.elements }; - int num_entry = 0; -! struct export_perms save_export_perms = {0,}; - struct gsh_export *saved_gsh_export = NULL; - - resp->resop = NFS4_OP_SECINFO; diff --git a/nfs-ganesha-2.1.0-nfs4_pseudo.patch b/nfs-ganesha-2.1.0-nfs4_pseudo.patch deleted file mode 100644 index a006aec..0000000 --- a/nfs-ganesha-2.1.0-nfs4_pseudo.patch +++ /dev/null @@ -1,23 +0,0 @@ -*** nfs-ganesha-2.1.0/src/Protocols/NFS/nfs4_pseudo.c.orig 2014-06-27 10:14:43.556133273 -0400 ---- nfs-ganesha-2.1.0/src/Protocols/NFS/nfs4_pseudo.c 2014-06-27 10:17:10.928133273 -0400 -*************** -*** 385,393 **** - /* Now we need to process the rest of the path, creating directories - * if necessary. - */ -! for (tok = strtok_r(rest, "/", &saveptr); -! tok; -! tok = strtok_r(NULL, "/", &saveptr)) { - rc = make_pseudofs_node(tok, &state); - if (!rc) { - /* Release reference on mount point inode ---- 385,393 ---- - /* Now we need to process the rest of the path, creating directories - * if necessary. - */ -! saveptr = NULL; -! tok = strtok_r(rest, "/", &saveptr); -! for (; tok; tok = strtok_r(NULL, "/", &saveptr)) { - rc = make_pseudofs_node(tok, &state); - if (!rc) { - /* Release reference on mount point inode diff --git a/nfs-ganesha-2.1.0-state_lock.patch b/nfs-ganesha-2.1.0-state_lock.patch deleted file mode 100644 index 1b0c824..0000000 --- a/nfs-ganesha-2.1.0-state_lock.patch +++ /dev/null @@ -1,21 +0,0 @@ -*** nfs-ganesha-2.1.0/src/SAL/state_lock.c.orig 2015-02-12 11:44:24.233718318 -0500 ---- nfs-ganesha-2.1.0/src/SAL/state_lock.c 2015-02-12 11:45:06.679718318 -0500 -*************** -*** 611,618 **** - * - * @return New entry or NULL. - */ -! inline state_lock_entry_t *state_lock_entry_t_dup(state_lock_entry_t * -! orig_entry) - { - return create_state_lock_entry(orig_entry->sle_entry, - orig_entry->sle_export, ---- 611,618 ---- - * - * @return New entry or NULL. - */ -! static inline state_lock_entry_t *state_lock_entry_t_dup(state_lock_entry_t * -! orig_entry) - { - return create_state_lock_entry(orig_entry->sle_entry, - orig_entry->sle_export, diff --git a/nfs-ganesha-2.1.0-support-CMakeLists.txt.patch b/nfs-ganesha-2.1.0-support-CMakeLists.txt.patch deleted file mode 100644 index 69b68ff..0000000 --- a/nfs-ganesha-2.1.0-support-CMakeLists.txt.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** nfs-ganesha-2.1.0/src/support/CMakeLists.txt.orig 2014-07-01 11:06:16.219133273 -0400 ---- nfs-ganesha-2.1.0/src/support/CMakeLists.txt 2014-07-01 11:05:03.312133273 -0400 -*************** -*** 33,39 **** - uid2grp_cache.c - ) - -! add_library( uid2grp ${uid2grp_SRCS} ) - - ########### next target ############### - ---- 33,39 ---- - uid2grp_cache.c - ) - -! add_library( uid2grp STATIC ${uid2grp_SRCS} ) - - ########### next target ############### - diff --git a/nfs-ganesha-2.2.0-CMakeLists.txt.patch b/nfs-ganesha-2.2.0-CMakeLists.txt.patch deleted file mode 100644 index e7f47a9..0000000 --- a/nfs-ganesha-2.2.0-CMakeLists.txt.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- nfs-ganesha-2.2.0/src/CMakeLists.txt.orig 2015-07-07 13:43:35.435240859 -0400 -+++ nfs-ganesha-2.2.0/src/CMakeLists.txt 2015-07-07 13:48:51.917240859 -0400 -@@ -716,9 +716,12 @@ - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/portability_cmake_2.8 /usr/share/cmake/Modules ${CMAKE_MODULE_PATH}) - endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8" ) - -+find_library(LIBNTIRPC ntirpc) # extended Pthreads functions -+ -+set(CMAKE_C_FLAGS "-isystem /usr/include/ntirpc ${CMAKE_C_FLAGS}") -+ - include_directories( - "${PROJECT_BINARY_DIR}/include" -- "${PROJECT_SOURCE_DIR}/libntirpc/ntirpc/" - "${PROJECT_SOURCE_DIR}/include" - "${OS_INCLUDE_DIR}" - "${KRB5_INCLUDE_DIRS}" -@@ -732,14 +735,13 @@ - set(_USE_CB_SIMULATOR ON) - endif(USE_CB_SIMULATOR) - -- - #callers add: - # target_link_libraries(your_library ${LIBTIRPC_LIBRARIES}) --set(LIBTIRPC_INCLUDE_DIR -- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc" -- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc/rpc" --) --set(LIBTIRPC_LIBRARIES "${PROJECT_BINARY_DIR}/libntirpc/src/libntirpc.a") -+#set(LIBTIRPC_INCLUDE_DIR -+# "${PROJECT_BINARY_DIR}/libtirpc/ntirpc" -+# "${PROJECT_BINARY_DIR}/libtirpc/ntirpc/rpc" -+#) -+#set(LIBTIRPC_LIBRARIES "${PROJECT_BINARY_DIR}/libntirpc/src/libntirpc.a") - - # Find misc system libs - find_library(LIBRT rt) # extended Pthreads functions -@@ -867,6 +869,7 @@ - ${KRB5_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ${LIBRT} -+ ${LIBNTIRPC} - ) - - # Config file; make sure it doesn't clobber an existing one -@@ -877,16 +880,6 @@ - # pre-create PREFIX/var/run/ganesha - install(DIRECTORY DESTINATION ${SYSSTATEDIR}/run/ganesha) - --IF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/CMakeLists.txt ) --message( FATAL_ERROR --"No CMakeLists.txt found in libntirpc --This probably means that the directory was not properly populated. --Please run the following command to do that and use cmake again: -- git submodule update --init --Alternatively, if you are not using git, get the current version at -- https://github.com/nfs-ganesha/ntirpc" ) --ENDIF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/CMakeLists.txt ) -- - add_subdirectory(log) - add_subdirectory(config_parsing) - add_subdirectory(cidr) -@@ -896,7 +889,6 @@ - add_subdirectory(NodeList) - add_subdirectory(cache_inode) - add_subdirectory(SAL) --add_subdirectory(libntirpc) - add_subdirectory(RPCAL) - add_subdirectory(Protocols) - add_subdirectory(support) diff --git a/nfs-ganesha-2.3rc1-jumbo.patch b/nfs-ganesha-2.3rc1-jumbo.patch deleted file mode 100644 index f30c1b0..0000000 --- a/nfs-ganesha-2.3rc1-jumbo.patch +++ /dev/null @@ -1,684 +0,0 @@ ---- nfs-ganesha-2.3-rc1/src/cache_inode/cache_inode_avl.c.orig 2015-09-10 09:39:55.666344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/cache_inode/cache_inode_avl.c 2015-09-10 09:45:02.850344661 -0400 -@@ -234,7 +234,7 @@ - /* tmp hook : it seems like client running v9fs dislike "negative" - * cookies just kill the sign bit, making - * cookies 63 bits... */ -- v->hk.k &= ~(1L << 63); -+ v->hk.k &= ~(1ULL << 63); - #endif - - /* XXX would we really wait for UINT64_MAX? if not, how many -@@ -259,7 +259,7 @@ - #ifdef _USE_9P - /* tmp hook : it seems like client running v9fs dislike "negative" - * cookies */ -- v->hk.k &= ~(1L << 63); -+ v->hk.k &= ~(1ULL << 63); - #endif - for (j2 = 1 /* tried j=0 */; j2 < UINT64_MAX; j2++) { - v->hk.k = v->hk.k + j2; -@@ -346,7 +346,7 @@ - #ifdef _USE_9P - /* tmp hook : it seems like client running v9fs dislike "negative" - * cookies */ -- v.hk.k &= ~(1L << 63); -+ v.hk.k &= ~(1ULL << 63); - #endif - - for (j = 0; j < maxj; j++) { ---- nfs-ganesha-2.3-rc1/src/cache_inode/cache_inode_lru.c.orig 2015-09-10 09:07:18.903344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/cache_inode/cache_inode_lru.c 2015-09-10 09:24:01.710344661 -0400 -@@ -708,7 +708,7 @@ - lru_state.futility = 0; - } - -- LogFullDebug(COMPONENT_CACHE_INODE_LRU, "lru entries: %zu", -+ LogFullDebug(COMPONENT_CACHE_INODE_LRU, "lru entries: %" PRIu64, - lru_state.entries_used); - - /* Reap file descriptors. This is a preliminary example of the -@@ -745,7 +745,7 @@ - LogFullDebug(COMPONENT_CACHE_INODE_LRU, - "fdrate:%u fdcount:%zd slept for %" PRIu64 " sec", - fdratepersec, formeropen, -- curr_time - lru_state.prev_time); -+ ((uint64_t) (curr_time - lru_state.prev_time))); - - if (extremis) { - LogDebug(COMPONENT_CACHE_INODE_LRU, -@@ -925,7 +925,8 @@ - "After work, open_fd_count:%zd count:%" PRIu64 - " fdrate:%u threadwait=%" PRIu64, - atomic_fetch_size_t(&open_fd_count), -- lru_state.entries_used, fdratepersec, threadwait); -+ lru_state.entries_used, fdratepersec, -+ ((uint64_t) threadwait)); - LogFullDebug(COMPONENT_CACHE_INODE_LRU, - "currentopen=%zd futility=%d totalwork=%zd biggest_window=%d extremis=%d lanes=%d fds_lowat=%d ", - currentopen, lru_state.futility, totalwork, ---- nfs-ganesha-2.3-rc1/src/CMakeLists.txt.orig 2015-09-09 13:59:07.919344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/CMakeLists.txt 2015-09-09 14:04:39.235344661 -0400 -@@ -761,9 +761,12 @@ - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/portability_cmake_2.8 /usr/share/cmake/Modules ${CMAKE_MODULE_PATH}) - endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8" ) - -+find_library(LIBNTIRPC ntirpc) # extended Pthreads functions -+ -+set(CMAKE_C_FLAGS "-isystem /usr/include/ntirpc ${CMAKE_C_FLAGS}") -+ - include_directories( - "${PROJECT_BINARY_DIR}/include" -- "${PROJECT_SOURCE_DIR}/libntirpc/ntirpc/" - "${PROJECT_SOURCE_DIR}/include" - "${OS_INCLUDE_DIR}" - "${KRB5_INCLUDE_DIRS}" -@@ -779,12 +782,6 @@ - - - #callers add: --# target_link_libraries(your_library ${LIBTIRPC_LIBRARIES}) --set(LIBTIRPC_INCLUDE_DIR -- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc" -- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc/rpc" --) --set(LIBTIRPC_LIBRARIES ntirpc) - - # Find misc system libs - find_library(LIBRT rt) # extended Pthreads functions -@@ -912,6 +909,7 @@ - ${KRB5_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ${LIBRT} -+ ${LIBNTIRPC} - ) - - # Config file; make sure it doesn't clobber an existing one -@@ -922,16 +920,6 @@ - # pre-create PREFIX/var/run/ganesha - install(DIRECTORY DESTINATION ${SYSSTATEDIR}/run/ganesha) - --IF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/CMakeLists.txt ) --message( FATAL_ERROR --"No CMakeLists.txt found in libntirpc --This probably means that the directory was not properly populated. --Please run the following command to do that and use cmake again: -- git submodule update --init --Alternatively, if you are not using git, get the current version at -- https://github.com/nfs-ganesha/ntirpc" ) --ENDIF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/CMakeLists.txt ) -- - add_subdirectory(log) - add_subdirectory(config_parsing) - add_subdirectory(cidr) -@@ -941,7 +929,6 @@ - add_subdirectory(NodeList) - add_subdirectory(cache_inode) - add_subdirectory(SAL) --add_subdirectory(libntirpc) - add_subdirectory(RPCAL) - add_subdirectory(Protocols) - add_subdirectory(support) ---- nfs-ganesha-2.3-rc1/src/config_parsing/analyse.c.orig 2015-09-10 08:23:22.091344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/config_parsing/analyse.c 2015-09-10 08:25:12.379344661 -0400 -@@ -191,7 +191,7 @@ - - assert(tree->root.type == TYPE_ROOT); - fprintf(output, "\n"); -- fprintf(output, " %ld \n", -+ fprintf(output, " %zd \n", - glist_length(&tree->root.u.nterm.sub_nodes)); - fprintf(output, " \n"); - for (file = tree->files; file != NULL; file = file->next) ---- nfs-ganesha-2.3-rc1/src/config_parsing/config_parsing.c.orig 2015-09-10 08:41:39.615344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/config_parsing/config_parsing.c 2015-09-10 09:01:37.684344661 -0400 -@@ -758,13 +758,13 @@ - struct config_error_type *err_type) - { - struct config_item *item; -- caddr_t *param_addr; -+ void *param_addr; - sockaddr_t *sock; - int rc; - int errors = 0; - - for (item = params; item->name != NULL; item++) { -- param_addr = (caddr_t *)((uint64_t)param_struct + item->off); -+ param_addr = ((char *)param_struct + item->off); - LogFullDebug(COMPONENT_CONFIG, - "%p name=%s type=%s", - param_addr, item->name, config_type_str(item->type)); -@@ -970,7 +970,7 @@ - struct config_error_type *err_type) - { - struct config_item *item; -- caddr_t *param_addr; -+ void *param_addr; - struct config_node *node, *term_node, *next_node = NULL; - struct glist_head *ns; - int errors = 0; -@@ -1002,8 +1002,7 @@ - node = next_node; - continue; - } -- param_addr = (caddr_t *)((uint64_t)param_struct -- + item->off); -+ param_addr = ((char *)param_struct + item->off); - LogFullDebug(COMPONENT_CONFIG, - "%p name=%s type=%s", - param_addr, item->name, -@@ -1051,10 +1050,9 @@ - &num64, err_type)) { - *(int32_t *)param_addr = num64; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.i32.set_off); - *(uint32_t *)mask_addr - |= item->u.i32.bit; -@@ -1081,10 +1079,9 @@ - &num64, err_type)) { - *(uid_t *)param_addr = num64; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.i64.set_off); - *(uint32_t *)mask_addr - |= item->u.i64.bit; -@@ -1095,9 +1092,9 @@ - if (convert_fsid(term_node, param_addr, - err_type)) { - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.fsid.set_off); - *(uint32_t *)mask_addr - |= item->u.fsid.bit; -@@ -1137,9 +1134,9 @@ - *(uint32_t *)param_addr - &= ~item->u.bit.bit; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.bit.set_off); - *(uint32_t *)mask_addr - |= item->u.bit.bit; -@@ -1155,9 +1152,9 @@ - err_type)) { - *(uint32_t *)param_addr |= num32; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.lst.set_off); - *(uint32_t *)mask_addr - |= item->u.lst.mask; -@@ -1180,9 +1177,9 @@ - err_type)) { - *(uint32_t *)param_addr |= num32; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.lst.set_off); - *(uint32_t *)mask_addr - |= item->u.lst.mask; -@@ -1204,9 +1201,9 @@ - err_type)) { - *(uint32_t *)param_addr |= num32; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.lst.set_off); - *(uint32_t *)mask_addr - |= item->u.lst.bit; ---- nfs-ganesha-2.3-rc1/src/FSAL/common_pnfs.c.orig 2015-09-10 12:48:43.434344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/common_pnfs.c 2015-09-10 12:49:28.695344661 -0400 -@@ -291,7 +291,7 @@ - *(ds_ids + i), - &handle); - if (nfs_status != NFS4_OK) { -- LogMajor(COMPONENT_PNFS, "Failed converting FH %lu.", -+ LogMajor(COMPONENT_PNFS, "Failed converting FH %zu.", - i); - return nfs_status; - } -@@ -300,7 +300,7 @@ - (char **)&handle.nfs_fh4_val, - &handle.nfs_fh4_len, - handle.nfs_fh4_len)) { -- LogMajor(COMPONENT_PNFS, "Failed encoding FH %lu.", i); -+ LogMajor(COMPONENT_PNFS, "Failed encoding FH %zu.", i); - return NFS4ERR_SERVERFAULT; - } - } ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/export.c.orig 2015-09-10 11:41:29.614344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/export.c 2015-09-10 11:42:04.125344661 -0400 -@@ -212,7 +212,7 @@ - fh_size = GLAPI_HANDLE_LENGTH; - if (fh_desc->len != fh_size) { - LogMajor(COMPONENT_FSAL, -- "Size mismatch for handle. should be %lu, got %lu", -+ "Size mismatch for handle. should be %zu, got %zu", - fh_size, fh_desc->len); - return fsalstat(ERR_FSAL_SERVERFAULT, 0); - } ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/handle.c.orig 2015-09-10 11:43:46.414344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/handle.c 2015-09-10 11:51:17.085344661 -0400 -@@ -1248,7 +1248,7 @@ - */ - if (flock.l_len < 0) { - LogCrit(COMPONENT_FSAL, -- "The requested lock length is out of range- flock.l_len(%ld), request_lock_length(%lu)", -+ "The requested lock length is out of range- flock.l_len(%" PRIi64 "), request_lock_length(%" PRIu64 ")", - flock.l_len, request_lock->lock_length); - status.major = ERR_FSAL_BAD_RANGE; - goto out; -@@ -1515,7 +1515,7 @@ - fh_size = GLAPI_HANDLE_LENGTH; - if (fh_desc->len < fh_size) { - LogMajor(COMPONENT_FSAL, -- "Space too small for handle. need %lu, have %lu", -+ "Space too small for handle. need %zu, have %zu", - fh_size, fh_desc->len); - status.major = ERR_FSAL_TOOSMALL; - goto out; ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/posix_acls.c.orig 2015-09-10 07:59:08.715344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/posix_acls.c 2015-09-10 07:59:46.368344661 -0400 -@@ -471,7 +471,7 @@ - acl_t allow_acl, deny_acl; - acl_entry_t a_entry, d_entry; - acl_permset_t a_permset, e_a_permset, d_permset, e_d_permset; -- acl_tag_t tag; -+ acl_tag_t tag = -1; - char *acl_str; - unsigned int id; - bool mask = false; ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PROXY/handle.c.orig 2015-09-10 11:12:37.781344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PROXY/handle.c 2015-09-10 12:37:29.215344661 -0400 -@@ -907,7 +907,7 @@ - - if (!needed && pxy_rpc_renewer_wait(lease_time - 5)) { - /* Simply renew the client id you've got */ -- LogDebug(COMPONENT_FSAL, "Renewing client id %lx", -+ LogDebug(COMPONENT_FSAL, "Renewing client id %" PRIx64, - pxy_clientid); - arg.argop = NFS4_OP_RENEW; - arg.nfs_argop4_u.oprenew.clientid = pxy_clientid; -@@ -915,7 +915,7 @@ - &res); - if (rc == NFS4_OK) { - LogDebug(COMPONENT_FSAL, -- "Renewed client id %lx", pxy_clientid); -+ "Renewed client id %" PRIx64, pxy_clientid); - continue; - } - } -@@ -2223,7 +2223,7 @@ - #endif - if (fh_desc->len != fh_size) { - LogMajor(COMPONENT_FSAL, -- "Size mismatch for handle. should be %lu, got %lu", -+ "Size mismatch for handle. should be %zu, got %zu", - fh_size, fh_desc->len); - return fsalstat(ERR_FSAL_SERVERFAULT, 0); - } ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PSEUDO/export.c.orig 2015-09-10 12:30:54.996344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PSEUDO/export.c 2015-09-10 12:31:21.319344661 -0400 -@@ -253,7 +253,7 @@ - - if (fh_desc->len < fh_min) { - LogMajor(COMPONENT_FSAL, -- "Size mismatch for handle. should be >= %lu, got %lu", -+ "Size mismatch for handle. should be >= %zu, got %zu", - fh_min, fh_desc->len); - return fsalstat(ERR_FSAL_SERVERFAULT, 0); - } ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PSEUDO/handle.c.orig 2015-09-10 11:05:27.445344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PSEUDO/handle.c 2015-09-10 12:22:02.934344661 -0400 -@@ -675,8 +675,9 @@ - case FSAL_DIGEST_NFSV4: - if (fh_desc->len < V4_FH_OPAQUE_SIZE) { - LogMajor(COMPONENT_FSAL, -- "Space too small for handle. need %lu, have %lu", -- V4_FH_OPAQUE_SIZE, fh_desc->len); -+ "Space too small for handle. need %lu, have %zu", -+ ((unsigned long) V4_FH_OPAQUE_SIZE), -+ fh_desc->len); - return fsalstat(ERR_FSAL_TOOSMALL, 0); - } - -@@ -850,9 +851,9 @@ - - if (hdl_desc->len != V4_FH_OPAQUE_SIZE) { - LogCrit(COMPONENT_FSAL, -- "Invalid handle size %lu expected %zu", -+ "Invalid handle size %zu expected %lu", - hdl_desc->len, -- V4_FH_OPAQUE_SIZE); -+ ((unsigned long) V4_FH_OPAQUE_SIZE)); - - return fsalstat(ERR_FSAL_BADHANDLE, 0); - } ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_VFS/file.c.orig 2015-09-10 11:56:58.263344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_VFS/file.c 2015-09-10 11:58:01.350344661 -0400 -@@ -297,7 +297,7 @@ - goto out; - } - 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); - if (lock_op == FSAL_OP_LOCKT) { -@@ -336,7 +336,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(%ld), request_lock_length(%" PRIu64 ")", - lock_args.l_len, request_lock->lock_length); - fsal_error = ERR_FSAL_BAD_RANGE; - goto out; ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_VFS/handle.c.orig 2015-09-10 11:53:08.591344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_VFS/handle.c 2015-09-10 11:54:21.005344661 -0400 -@@ -1711,8 +1711,8 @@ - case FSAL_DIGEST_NFSV4: - if (fh_desc->len < myself->handle->handle_len) { - LogMajor(COMPONENT_FSAL, -- "Space too small for handle. need %d, have %lu", -- (int) myself->handle->handle_len, -+ "Space too small for handle. need %u, have %zu", -+ myself->handle->handle_len, - fh_desc->len); - return fsalstat(ERR_FSAL_TOOSMALL, 0); - } ---- nfs-ganesha-2.3-rc1/src/MainNFSD/nfs_init.c.orig 2015-09-10 09:30:35.696344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/MainNFSD/nfs_init.c 2015-09-10 09:31:35.054344661 -0400 -@@ -196,12 +196,12 @@ - printf("\tDRC_UDP_Checksum = %u ;\n", - nfs_param.core_param.drc.udp.checksum); - printf("\tDecoder_Fridge_Expiration_Delay = %" PRIu64 " ;\n", -- nfs_param.core_param.decoder_fridge_expiration_delay); -+ ((uint64_t) nfs_param.core_param.decoder_fridge_expiration_delay)); - printf("\tDecoder_Fridge_Block_Timeout = %" PRIu64 " ;\n", -- nfs_param.core_param.decoder_fridge_block_timeout); -+ ((uint64_t) nfs_param.core_param.decoder_fridge_block_timeout)); - - printf("\tManage_Gids_Expiration = %" PRIu64 " ;\n", -- nfs_param.core_param.manage_gids_expiration); -+ ((uint64_t) nfs_param.core_param.manage_gids_expiration)); - - if (nfs_param.core_param.drop_io_errors) - printf("\tDrop_IO_Errors = true ;\n"); ---- nfs-ganesha-2.3-rc1/src/Protocols/9P/9p_xattrwalk.c.orig 2015-09-10 11:22:58.239344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/9P/9p_xattrwalk.c 2015-09-10 11:24:26.539344661 -0400 -@@ -56,7 +56,7 @@ - u32 *attrfid = NULL; - u16 *name_len; - char *name_str; -- u64 attrsize = 0LL; -+ size_t attrsize = 0; - - fsal_status_t fsal_status; - char name[MAXNAMLEN]; -@@ -152,7 +152,7 @@ - } - - xattr_cursor = pxattrfid->specdata.xattr.xattr_content; -- attrsize = 0LL; -+ attrsize = 0; - for (i = 0; i < nb_xattrs_read; i++) { - tmplen = - snprintf(xattr_cursor, MAXNAMLEN, "%s", ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_fsstat.c.orig 2015-09-10 10:33:35.075344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_fsstat.c 2015-09-10 10:36:27.213344661 -0400 -@@ -99,7 +99,7 @@ - - if (cache_status == CACHE_INODE_SUCCESS) { - LogFullDebug(COMPONENT_NFSPROTO, -- "nfs_Fsstat --> dynamicinfo.total_bytes=%zu dynamicinfo.free_bytes=%zu dynamicinfo.avail_bytes=%zu", -+ "nfs_Fsstat --> dynamicinfo.total_bytes=%" PRIu64 " dynamicinfo.free_bytes=%" PRIu64 " dynamicinfo.avail_bytes=%" PRIu64, - dynamicinfo.total_bytes, dynamicinfo.free_bytes, - dynamicinfo.avail_bytes); - LogFullDebug(COMPONENT_NFSPROTO, ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_read.c.orig 2015-09-10 10:44:30.812344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_read.c 2015-09-10 10:46:25.586344661 -0400 -@@ -106,7 +106,7 @@ - nfs_FhandleToStr(req->rq_vers, &arg->arg_read3.file, NULL, str); - LogDebug(COMPONENT_NFSPROTO, - "REQUEST PROCESSING: Calling nfs_Read handle: %s start: %" -- PRIu64 " len: %" PRIu64, -+ PRIu64 " len: %zu", - str, offset, size); - } - ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_write.c.orig 2015-09-10 10:52:26.791344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_write.c 2015-09-10 10:55:23.321344661 -0400 -@@ -109,7 +109,7 @@ - - LogDebug(COMPONENT_NFSPROTO, - "REQUEST PROCESSING: Calling nfs_Write handle: %s start: %" -- PRIx64 " len: %" PRIx64 " %s", -+ PRIx64 " len: %zx %s", - str, offset, size, stables); - } - -@@ -180,7 +180,7 @@ - /* Do not exceed maxium WRITE offset if set */ - if (op_ctx->export->MaxOffsetWrite < UINT64_MAX) { - LogFullDebug(COMPONENT_NFSPROTO, -- "Write offset=%" PRIu64 " count=%" PRIu64 -+ "Write offset=%" PRIu64 " size=%zu" - " MaxOffSet=%" PRIu64, offset, size, - op_ctx->export->MaxOffsetWrite); - ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs4_op_layoutget.c.orig 2015-09-10 11:27:03.276344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs4_op_layoutget.c 2015-09-10 11:30:09.100344661 -0400 -@@ -547,7 +547,7 @@ - nfsstat4 nfs_status = 0; - - LogEvent(COMPONENT_PNFS, -- "LAYOUTERROR OP %d status %d offset: %lu length: %lu", -+ "LAYOUTERROR OP %d status %d offset: %" PRIu64 " length: %" PRIu64, - arg_LAYOUTERROR4->lea_errors.de_opnum, - arg_LAYOUTERROR4->lea_errors.de_status, - arg_LAYOUTERROR4->lea_offset, -@@ -577,12 +577,12 @@ - nfsstat4 nfs_status = 0; - - LogEvent(COMPONENT_PNFS, -- "LAYOUTSTATS offset %lu length %lu", -+ "LAYOUTSTATS offset %" PRIu64 " length %" PRIu64, - arg_LAYOUTSTATS4->lsa_offset, - arg_LAYOUTSTATS4->lsa_length); - - LogEvent(COMPONENT_PNFS, -- "LAYOUTSTATS read count %u bytes %lu write count %u bytes %lu", -+ "LAYOUTSTATS read count %u bytes %" PRIu64 " write count %u bytes %" PRIu64, - arg_LAYOUTSTATS4->lsa_read.ii_count, - arg_LAYOUTSTATS4->lsa_read.ii_bytes, - arg_LAYOUTSTATS4->lsa_write.ii_count, ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs4_op_read.c.orig 2015-09-10 11:35:03.095344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs4_op_read.c 2015-09-10 12:33:31.070344661 -0400 -@@ -418,7 +418,7 @@ - if (op_ctx->export->MaxOffsetRead < UINT64_MAX) { - LogFullDebug(COMPONENT_NFS_V4, - "Read offset=%" PRIu64 -- " count=%zd MaxOffSet=%" PRIu64, -+ " size=%" PRIu64 " MaxOffSet=%" PRIu64, - offset, size, - op_ctx->export->MaxOffsetRead); - -@@ -710,7 +710,7 @@ - } - done: - LogDebug(COMPONENT_NFS_V4, -- "Status %s hints 0x%X offset %ld count %ld ", -+ "Status %s hints 0x%X offset %" PRIu64 " count %" PRIu64, - nfsstat4_to_str(res_IO_ADVISE->iaa_status), - hints.hints, hints.offset, hints.count); - -@@ -792,7 +792,7 @@ - } - done: - LogDebug(COMPONENT_NFS_V4, -- "Status %s type %d offset %ld ", -+ "Status %s type %d offset %" PRIu64, - nfsstat4_to_str(res_SEEK->sr_status), arg_SEEK->sa_what, - arg_SEEK->sa_offset); - ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs_proto_tools.c.orig 2015-09-10 12:34:47.664344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs_proto_tools.c 2015-09-10 12:35:56.368344661 -0400 -@@ -3715,7 +3715,7 @@ - nfs3_FSALattr_To_PartialFattr(FSAL_attr, &got, Fattr); - if (want & ~got) { - LogCrit(COMPONENT_NFSPROTO, -- "Likely bug: FSAL did not fill in a standard NFSv3 attribute: missing %lx", -+ "Likely bug: FSAL did not fill in a standard NFSv3 attribute: missing %" PRIx64, - want & ~got); - } - -@@ -4206,6 +4206,6 @@ - if (!(attr->mode & S_ISVTX)) - return false; - -- LogDebug(COMPONENT_NFS_V4, "sticky bit is set on %ld", attr->fileid); -+ LogDebug(COMPONENT_NFS_V4, "sticky bit is set on %" PRIi64, attr->fileid); - return true; - } ---- nfs-ganesha-2.3-rc1/src/SAL/nfs4_recovery.c.orig 2015-09-10 10:14:22.739344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/SAL/nfs4_recovery.c 2015-09-10 10:29:20.513344661 -0400 -@@ -66,8 +66,6 @@ - */ - void nfs4_start_grace(nfs_grace_start_t *gsp) - { -- time_t current_time; -- - if (nfs_param.nfsv4_param.graceless) { - LogEvent(COMPONENT_STATE, - "NFS Server skipping GRACE (Graceless is true)"); -@@ -81,8 +79,7 @@ - * seconds Lease_Lifetime should be set to a smaller value for those - * setups. - */ -- current_time = time(NULL); -- atomic_store_uint64_t(¤t_grace, current_time); -+ atomic_store_time_t(¤t_grace, time(NULL)); - - LogEvent(COMPONENT_STATE, "NFS Server Now IN GRACE, duration %d", - (int)nfs_param.nfsv4_param.lease_lifetime); -@@ -220,7 +217,7 @@ - PATH_MAX) > 0) { - /* convert_opaque_value_max_for_dir does not prefix - * the "(:". So we need to do it here */ -- sprintf(cidstr_len, "%ld", strlen(cidstr)); -+ snprintf(cidstr_len, sizeof cidstr_len, "%zd", strlen(cidstr)); - total_len = strlen(cidstr) + strlen(str_client_addr) + 5 + - strlen(cidstr_len); - /* hold both long form clientid and IP */ -@@ -268,7 +265,7 @@ - PATH_MAX) > 0) { - /* convert_opaque_value_max_for_dir does not prefix - * the "(:". So we need to do it here */ -- sprintf(cidstr_len, "%ld", strlen(cidstr)); -+ snprintf(cidstr_len, sizeof cidstr_len, "%zd", strlen(cidstr)); - total_len = strlen(cidstr) + strlen(buf) + 5 + - strlen(cidstr_len); - /* hold both long form clientid and IP */ -@@ -371,7 +368,7 @@ - dentp->d_name[0] != '\x1') { - continue; - } -- sprintf(del_path, "%s/%s", path, dentp->d_name); -+ snprintf(del_path, sizeof del_path, "%s/%s", path, dentp->d_name); - if (unlink(del_path) < 0) { - LogEvent(COMPONENT_CLIENTID, - "unlink of %s failed errno: %d", -@@ -576,7 +573,7 @@ - char lopath[PATH_MAX]; - int fd; - -- sprintf(lopath, "%s/", tgtdir); -+ snprintf(lopath, sizeof lopath, "%s/", tgtdir); - strncat(lopath, dentp->d_name, strlen(dentp->d_name)); - fd = creat(lopath, 0700); - if (fd < 0) { -@@ -613,7 +610,7 @@ - if (del) { - char del_path[PATH_MAX]; - -- sprintf(del_path, "%s/%s", path, dentp->d_name); -+ snprintf(del_path, sizeof del_path, "%s/%s", path, dentp->d_name); - if (unlink(del_path) < 0) { - LogEvent(COMPONENT_CLIENTID, - "unlink of %s failed errno: %d", -@@ -1018,7 +1015,7 @@ - if (dentp->d_name[0] == '\x1') { - char del_path[PATH_MAX]; - -- sprintf(del_path, "%s/%s", parent_path, dentp->d_name); -+ snprintf(del_path, sizeof del_path, "%s/%s", parent_path, dentp->d_name); - if (unlink(del_path) < 0) { - LogEvent(COMPONENT_CLIENTID, - "unlink of %s failed errno: %d", ---- nfs-ganesha-2.3-rc1/src/SAL/nfs4_state_id.c.orig 2015-09-10 09:51:49.633344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/SAL/nfs4_state_id.c 2015-09-10 10:08:58.896344661 -0400 -@@ -365,8 +365,7 @@ - res = ((uint32_t) pkey->state_owner->so_owner.so_nfs4_owner.so_clientid - + (uint32_t) sum + pkey->state_owner->so_owner_len - + (uint32_t) pkey->state_owner->so_type -- + (uint32_t) (uint64_t) pkey->state_entry) -- % (uint32_t) hparam->index_size; -+ + ((uintptr_t) pkey->state_entry)) % (uint32_t) hparam->index_size; - - if (isDebug(COMPONENT_HASHTABLE)) - LogFullDebug(COMPONENT_STATE, "value = %" PRIu32, res); -@@ -401,7 +400,7 @@ - res = (uint64_t) pkey->state_owner->so_owner.so_nfs4_owner.so_clientid - + (uint64_t) sum + pkey->state_owner->so_owner_len - + (uint64_t) pkey->state_owner->so_type -- + (uint64_t) pkey->state_entry; -+ + (uintptr_t) pkey->state_entry; - - if (isDebug(COMPONENT_HASHTABLE)) - LogFullDebug(COMPONENT_STATE, "rbt = %" PRIu64, res); ---- nfs-ganesha-2.3-rc1/src/support/exports.c.orig 2015-09-10 11:19:42.941344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/support/exports.c 2015-09-10 11:20:44.579344661 -0400 -@@ -818,7 +818,7 @@ - export->fullpath, export->FS_tag, perms); - - LogInfo(COMPONENT_CONFIG, -- "Export %d has %ld defined clients", export->export_id, -+ "Export %d has %zd defined clients", export->export_id, - glist_length(&export->clients)); - put_gsh_export(export); - return 0; diff --git a/nfs-ganesha-2.3rc2-jumbo.patch b/nfs-ganesha-2.3rc2-jumbo.patch deleted file mode 100644 index 0653b2b..0000000 --- a/nfs-ganesha-2.3rc2-jumbo.patch +++ /dev/null @@ -1,684 +0,0 @@ ---- nfs-ganesha-2.3-rc1/src/cache_inode/cache_inode_avl.c.orig 2015-09-10 09:39:55.666344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/cache_inode/cache_inode_avl.c 2015-09-10 09:45:02.850344661 -0400 -@@ -234,7 +234,7 @@ - /* tmp hook : it seems like client running v9fs dislike "negative" - * cookies just kill the sign bit, making - * cookies 63 bits... */ -- v->hk.k &= ~(1L << 63); -+ v->hk.k &= ~(1ULL << 63); - #endif - - /* XXX would we really wait for UINT64_MAX? if not, how many -@@ -259,7 +259,7 @@ - #ifdef _USE_9P - /* tmp hook : it seems like client running v9fs dislike "negative" - * cookies */ -- v->hk.k &= ~(1L << 63); -+ v->hk.k &= ~(1ULL << 63); - #endif - for (j2 = 1 /* tried j=0 */; j2 < UINT64_MAX; j2++) { - v->hk.k = v->hk.k + j2; -@@ -346,7 +346,7 @@ - #ifdef _USE_9P - /* tmp hook : it seems like client running v9fs dislike "negative" - * cookies */ -- v.hk.k &= ~(1L << 63); -+ v.hk.k &= ~(1ULL << 63); - #endif - - for (j = 0; j < maxj; j++) { ---- nfs-ganesha-2.3-rc1/src/cache_inode/cache_inode_lru.c.orig 2015-09-10 09:07:18.903344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/cache_inode/cache_inode_lru.c 2015-09-10 09:24:01.710344661 -0400 -@@ -708,7 +708,7 @@ - lru_state.futility = 0; - } - -- LogFullDebug(COMPONENT_CACHE_INODE_LRU, "lru entries: %zu", -+ LogFullDebug(COMPONENT_CACHE_INODE_LRU, "lru entries: %" PRIu64, - lru_state.entries_used); - - /* Reap file descriptors. This is a preliminary example of the -@@ -745,7 +745,7 @@ - LogFullDebug(COMPONENT_CACHE_INODE_LRU, - "fdrate:%u fdcount:%zd slept for %" PRIu64 " sec", - fdratepersec, formeropen, -- curr_time - lru_state.prev_time); -+ ((uint64_t) (curr_time - lru_state.prev_time))); - - if (extremis) { - LogDebug(COMPONENT_CACHE_INODE_LRU, -@@ -925,7 +925,8 @@ - "After work, open_fd_count:%zd count:%" PRIu64 - " fdrate:%u threadwait=%" PRIu64, - atomic_fetch_size_t(&open_fd_count), -- lru_state.entries_used, fdratepersec, threadwait); -+ lru_state.entries_used, fdratepersec, -+ ((uint64_t) threadwait)); - LogFullDebug(COMPONENT_CACHE_INODE_LRU, - "currentopen=%zd futility=%d totalwork=%zd biggest_window=%d extremis=%d lanes=%d fds_lowat=%d ", - currentopen, lru_state.futility, totalwork, ---- nfs-ganesha-2.3-rc2/src/CMakeLists.txt.orig 2015-09-11 19:01:01.530344661 -0400 -+++ nfs-ganesha-2.3-rc2/src/CMakeLists.txt 2015-09-11 19:05:13.269344661 -0400 -@@ -765,9 +765,12 @@ - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/portability_cmake_2.8 /usr/share/cmake/Modules ${CMAKE_MODULE_PATH}) - endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8" ) - -+find_library(LIBNTIRPC ntirpc) -+ -+set(CMAKE_C_FLAGS "-isystem /usr/include/ntirpc ${CMAKE_C_FLAGS}") -+ - include_directories( - "${PROJECT_BINARY_DIR}/include" -- "${PROJECT_SOURCE_DIR}/libntirpc/ntirpc/" - "${PROJECT_SOURCE_DIR}/include" - "${OS_INCLUDE_DIR}" - "${KRB5_INCLUDE_DIRS}" -@@ -783,12 +786,6 @@ - - - #callers add: --# target_link_libraries(your_library ${LIBTIRPC_LIBRARIES}) --set(LIBTIRPC_INCLUDE_DIR -- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc" -- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc/rpc" --) --set(LIBTIRPC_LIBRARIES ntirpc) - - # Find misc system libs - find_library(LIBRT rt) # extended Pthreads functions -@@ -916,6 +913,7 @@ - ${KRB5_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ${LIBRT} -+ ${LIBNTIRPC} - ) - - # Config file; make sure it doesn't clobber an existing one -@@ -926,16 +924,6 @@ - # pre-create PREFIX/var/run/ganesha - install(DIRECTORY DESTINATION ${SYSSTATEDIR}/run/ganesha) - --IF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/ganesha/CMakeLists.txt ) --message( FATAL_ERROR --"No CMakeLists.txt found in libntirpc --This probably means that the directory was not properly populated. --Please run the following command to do that and use cmake again: -- git submodule update --init --Alternatively, if you are not using git, get the current version at -- https://github.com/nfs-ganesha/ntirpc" ) --ENDIF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/ganesha/CMakeLists.txt ) -- - add_subdirectory(log) - add_subdirectory(config_parsing) - add_subdirectory(cidr) -@@ -945,7 +933,6 @@ - add_subdirectory(NodeList) - add_subdirectory(cache_inode) - add_subdirectory(SAL) --add_subdirectory(libntirpc/ganesha) - add_subdirectory(RPCAL) - add_subdirectory(Protocols) - add_subdirectory(support) ---- nfs-ganesha-2.3-rc1/src/config_parsing/analyse.c.orig 2015-09-10 08:23:22.091344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/config_parsing/analyse.c 2015-09-10 08:25:12.379344661 -0400 -@@ -191,7 +191,7 @@ - - assert(tree->root.type == TYPE_ROOT); - fprintf(output, "\n"); -- fprintf(output, " %ld \n", -+ fprintf(output, " %zd \n", - glist_length(&tree->root.u.nterm.sub_nodes)); - fprintf(output, " \n"); - for (file = tree->files; file != NULL; file = file->next) ---- nfs-ganesha-2.3-rc1/src/config_parsing/config_parsing.c.orig 2015-09-10 08:41:39.615344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/config_parsing/config_parsing.c 2015-09-10 09:01:37.684344661 -0400 -@@ -758,13 +758,13 @@ - struct config_error_type *err_type) - { - struct config_item *item; -- caddr_t *param_addr; -+ void *param_addr; - sockaddr_t *sock; - int rc; - int errors = 0; - - for (item = params; item->name != NULL; item++) { -- param_addr = (caddr_t *)((uint64_t)param_struct + item->off); -+ param_addr = ((char *)param_struct + item->off); - LogFullDebug(COMPONENT_CONFIG, - "%p name=%s type=%s", - param_addr, item->name, config_type_str(item->type)); -@@ -970,7 +970,7 @@ - struct config_error_type *err_type) - { - struct config_item *item; -- caddr_t *param_addr; -+ void *param_addr; - struct config_node *node, *term_node, *next_node = NULL; - struct glist_head *ns; - int errors = 0; -@@ -1002,8 +1002,7 @@ - node = next_node; - continue; - } -- param_addr = (caddr_t *)((uint64_t)param_struct -- + item->off); -+ param_addr = ((char *)param_struct + item->off); - LogFullDebug(COMPONENT_CONFIG, - "%p name=%s type=%s", - param_addr, item->name, -@@ -1051,10 +1050,9 @@ - &num64, err_type)) { - *(int32_t *)param_addr = num64; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.i32.set_off); - *(uint32_t *)mask_addr - |= item->u.i32.bit; -@@ -1081,10 +1079,9 @@ - &num64, err_type)) { - *(uid_t *)param_addr = num64; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.i64.set_off); - *(uint32_t *)mask_addr - |= item->u.i64.bit; -@@ -1095,9 +1092,9 @@ - if (convert_fsid(term_node, param_addr, - err_type)) { - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.fsid.set_off); - *(uint32_t *)mask_addr - |= item->u.fsid.bit; -@@ -1137,9 +1134,9 @@ - *(uint32_t *)param_addr - &= ~item->u.bit.bit; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.bit.set_off); - *(uint32_t *)mask_addr - |= item->u.bit.bit; -@@ -1155,9 +1152,9 @@ - err_type)) { - *(uint32_t *)param_addr |= num32; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.lst.set_off); - *(uint32_t *)mask_addr - |= item->u.lst.mask; -@@ -1180,9 +1177,9 @@ - err_type)) { - *(uint32_t *)param_addr |= num32; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.lst.set_off); - *(uint32_t *)mask_addr - |= item->u.lst.mask; -@@ -1204,9 +1201,9 @@ - err_type)) { - *(uint32_t *)param_addr |= num32; - if (item->flags & CONFIG_MARK_SET) { -- caddr_t *mask_addr; -- mask_addr = (caddr_t *) -- ((uint64_t)param_struct -+ void *mask_addr; -+ mask_addr = -+ ((char *)param_struct - + item->u.lst.set_off); - *(uint32_t *)mask_addr - |= item->u.lst.bit; ---- nfs-ganesha-2.3-rc1/src/FSAL/common_pnfs.c.orig 2015-09-10 12:48:43.434344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/common_pnfs.c 2015-09-10 12:49:28.695344661 -0400 -@@ -291,7 +291,7 @@ - *(ds_ids + i), - &handle); - if (nfs_status != NFS4_OK) { -- LogMajor(COMPONENT_PNFS, "Failed converting FH %lu.", -+ LogMajor(COMPONENT_PNFS, "Failed converting FH %zu.", - i); - return nfs_status; - } -@@ -300,7 +300,7 @@ - (char **)&handle.nfs_fh4_val, - &handle.nfs_fh4_len, - handle.nfs_fh4_len)) { -- LogMajor(COMPONENT_PNFS, "Failed encoding FH %lu.", i); -+ LogMajor(COMPONENT_PNFS, "Failed encoding FH %zu.", i); - return NFS4ERR_SERVERFAULT; - } - } ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/export.c.orig 2015-09-10 11:41:29.614344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/export.c 2015-09-10 11:42:04.125344661 -0400 -@@ -212,7 +212,7 @@ - fh_size = GLAPI_HANDLE_LENGTH; - if (fh_desc->len != fh_size) { - LogMajor(COMPONENT_FSAL, -- "Size mismatch for handle. should be %lu, got %lu", -+ "Size mismatch for handle. should be %zu, got %zu", - fh_size, fh_desc->len); - return fsalstat(ERR_FSAL_SERVERFAULT, 0); - } ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/handle.c.orig 2015-09-10 11:43:46.414344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/handle.c 2015-09-10 11:51:17.085344661 -0400 -@@ -1248,7 +1248,7 @@ - */ - if (flock.l_len < 0) { - LogCrit(COMPONENT_FSAL, -- "The requested lock length is out of range- flock.l_len(%ld), request_lock_length(%lu)", -+ "The requested lock length is out of range- flock.l_len(%" PRIi64 "), request_lock_length(%" PRIu64 ")", - flock.l_len, request_lock->lock_length); - status.major = ERR_FSAL_BAD_RANGE; - goto out; -@@ -1515,7 +1515,7 @@ - fh_size = GLAPI_HANDLE_LENGTH; - if (fh_desc->len < fh_size) { - LogMajor(COMPONENT_FSAL, -- "Space too small for handle. need %lu, have %lu", -+ "Space too small for handle. need %zu, have %zu", - fh_size, fh_desc->len); - status.major = ERR_FSAL_TOOSMALL; - goto out; ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/posix_acls.c.orig 2015-09-10 07:59:08.715344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_GLUSTER/posix_acls.c 2015-09-10 07:59:46.368344661 -0400 -@@ -471,7 +471,7 @@ - acl_t allow_acl, deny_acl; - acl_entry_t a_entry, d_entry; - acl_permset_t a_permset, e_a_permset, d_permset, e_d_permset; -- acl_tag_t tag; -+ acl_tag_t tag = -1; - char *acl_str; - unsigned int id; - bool mask = false; ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PROXY/handle.c.orig 2015-09-10 11:12:37.781344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PROXY/handle.c 2015-09-10 12:37:29.215344661 -0400 -@@ -907,7 +907,7 @@ - - if (!needed && pxy_rpc_renewer_wait(lease_time - 5)) { - /* Simply renew the client id you've got */ -- LogDebug(COMPONENT_FSAL, "Renewing client id %lx", -+ LogDebug(COMPONENT_FSAL, "Renewing client id %" PRIx64, - pxy_clientid); - arg.argop = NFS4_OP_RENEW; - arg.nfs_argop4_u.oprenew.clientid = pxy_clientid; -@@ -915,7 +915,7 @@ - &res); - if (rc == NFS4_OK) { - LogDebug(COMPONENT_FSAL, -- "Renewed client id %lx", pxy_clientid); -+ "Renewed client id %" PRIx64, pxy_clientid); - continue; - } - } -@@ -2223,7 +2223,7 @@ - #endif - if (fh_desc->len != fh_size) { - LogMajor(COMPONENT_FSAL, -- "Size mismatch for handle. should be %lu, got %lu", -+ "Size mismatch for handle. should be %zu, got %zu", - fh_size, fh_desc->len); - return fsalstat(ERR_FSAL_SERVERFAULT, 0); - } ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PSEUDO/export.c.orig 2015-09-10 12:30:54.996344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PSEUDO/export.c 2015-09-10 12:31:21.319344661 -0400 -@@ -253,7 +253,7 @@ - - if (fh_desc->len < fh_min) { - LogMajor(COMPONENT_FSAL, -- "Size mismatch for handle. should be >= %lu, got %lu", -+ "Size mismatch for handle. should be >= %zu, got %zu", - fh_min, fh_desc->len); - return fsalstat(ERR_FSAL_SERVERFAULT, 0); - } ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PSEUDO/handle.c.orig 2015-09-10 11:05:27.445344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_PSEUDO/handle.c 2015-09-10 12:22:02.934344661 -0400 -@@ -675,8 +675,9 @@ - case FSAL_DIGEST_NFSV4: - if (fh_desc->len < V4_FH_OPAQUE_SIZE) { - LogMajor(COMPONENT_FSAL, -- "Space too small for handle. need %lu, have %lu", -- V4_FH_OPAQUE_SIZE, fh_desc->len); -+ "Space too small for handle. need %lu, have %zu", -+ ((unsigned long) V4_FH_OPAQUE_SIZE), -+ fh_desc->len); - return fsalstat(ERR_FSAL_TOOSMALL, 0); - } - -@@ -850,9 +851,9 @@ - - if (hdl_desc->len != V4_FH_OPAQUE_SIZE) { - LogCrit(COMPONENT_FSAL, -- "Invalid handle size %lu expected %zu", -+ "Invalid handle size %zu expected %lu", - hdl_desc->len, -- V4_FH_OPAQUE_SIZE); -+ ((unsigned long) V4_FH_OPAQUE_SIZE)); - - return fsalstat(ERR_FSAL_BADHANDLE, 0); - } ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_VFS/file.c.orig 2015-09-10 11:56:58.263344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_VFS/file.c 2015-09-10 11:58:01.350344661 -0400 -@@ -297,7 +297,7 @@ - goto out; - } - 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); - if (lock_op == FSAL_OP_LOCKT) { -@@ -336,7 +336,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(%ld), request_lock_length(%" PRIu64 ")", - lock_args.l_len, request_lock->lock_length); - fsal_error = ERR_FSAL_BAD_RANGE; - goto out; ---- nfs-ganesha-2.3-rc1/src/FSAL/FSAL_VFS/handle.c.orig 2015-09-10 11:53:08.591344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/FSAL/FSAL_VFS/handle.c 2015-09-10 11:54:21.005344661 -0400 -@@ -1711,8 +1711,8 @@ - case FSAL_DIGEST_NFSV4: - if (fh_desc->len < myself->handle->handle_len) { - LogMajor(COMPONENT_FSAL, -- "Space too small for handle. need %d, have %lu", -- (int) myself->handle->handle_len, -+ "Space too small for handle. need %u, have %zu", -+ myself->handle->handle_len, - fh_desc->len); - return fsalstat(ERR_FSAL_TOOSMALL, 0); - } ---- nfs-ganesha-2.3-rc1/src/MainNFSD/nfs_init.c.orig 2015-09-10 09:30:35.696344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/MainNFSD/nfs_init.c 2015-09-10 09:31:35.054344661 -0400 -@@ -196,12 +196,12 @@ - printf("\tDRC_UDP_Checksum = %u ;\n", - nfs_param.core_param.drc.udp.checksum); - printf("\tDecoder_Fridge_Expiration_Delay = %" PRIu64 " ;\n", -- nfs_param.core_param.decoder_fridge_expiration_delay); -+ ((uint64_t) nfs_param.core_param.decoder_fridge_expiration_delay)); - printf("\tDecoder_Fridge_Block_Timeout = %" PRIu64 " ;\n", -- nfs_param.core_param.decoder_fridge_block_timeout); -+ ((uint64_t) nfs_param.core_param.decoder_fridge_block_timeout)); - - printf("\tManage_Gids_Expiration = %" PRIu64 " ;\n", -- nfs_param.core_param.manage_gids_expiration); -+ ((uint64_t) nfs_param.core_param.manage_gids_expiration)); - - if (nfs_param.core_param.drop_io_errors) - printf("\tDrop_IO_Errors = true ;\n"); ---- nfs-ganesha-2.3-rc1/src/Protocols/9P/9p_xattrwalk.c.orig 2015-09-10 11:22:58.239344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/9P/9p_xattrwalk.c 2015-09-10 11:24:26.539344661 -0400 -@@ -56,7 +56,7 @@ - u32 *attrfid = NULL; - u16 *name_len; - char *name_str; -- u64 attrsize = 0LL; -+ size_t attrsize = 0; - - fsal_status_t fsal_status; - char name[MAXNAMLEN]; -@@ -152,7 +152,7 @@ - } - - xattr_cursor = pxattrfid->specdata.xattr.xattr_content; -- attrsize = 0LL; -+ attrsize = 0; - for (i = 0; i < nb_xattrs_read; i++) { - tmplen = - snprintf(xattr_cursor, MAXNAMLEN, "%s", ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_fsstat.c.orig 2015-09-10 10:33:35.075344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_fsstat.c 2015-09-10 10:36:27.213344661 -0400 -@@ -99,7 +99,7 @@ - - if (cache_status == CACHE_INODE_SUCCESS) { - LogFullDebug(COMPONENT_NFSPROTO, -- "nfs_Fsstat --> dynamicinfo.total_bytes=%zu dynamicinfo.free_bytes=%zu dynamicinfo.avail_bytes=%zu", -+ "nfs_Fsstat --> dynamicinfo.total_bytes=%" PRIu64 " dynamicinfo.free_bytes=%" PRIu64 " dynamicinfo.avail_bytes=%" PRIu64, - dynamicinfo.total_bytes, dynamicinfo.free_bytes, - dynamicinfo.avail_bytes); - LogFullDebug(COMPONENT_NFSPROTO, ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_read.c.orig 2015-09-10 10:44:30.812344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_read.c 2015-09-10 10:46:25.586344661 -0400 -@@ -106,7 +106,7 @@ - nfs_FhandleToStr(req->rq_vers, &arg->arg_read3.file, NULL, str); - LogDebug(COMPONENT_NFSPROTO, - "REQUEST PROCESSING: Calling nfs_Read handle: %s start: %" -- PRIu64 " len: %" PRIu64, -+ PRIu64 " len: %zu", - str, offset, size); - } - ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_write.c.orig 2015-09-10 10:52:26.791344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs3_write.c 2015-09-10 10:55:23.321344661 -0400 -@@ -109,7 +109,7 @@ - - LogDebug(COMPONENT_NFSPROTO, - "REQUEST PROCESSING: Calling nfs_Write handle: %s start: %" -- PRIx64 " len: %" PRIx64 " %s", -+ PRIx64 " len: %zx %s", - str, offset, size, stables); - } - -@@ -180,7 +180,7 @@ - /* Do not exceed maxium WRITE offset if set */ - if (op_ctx->export->MaxOffsetWrite < UINT64_MAX) { - LogFullDebug(COMPONENT_NFSPROTO, -- "Write offset=%" PRIu64 " count=%" PRIu64 -+ "Write offset=%" PRIu64 " size=%zu" - " MaxOffSet=%" PRIu64, offset, size, - op_ctx->export->MaxOffsetWrite); - ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs4_op_layoutget.c.orig 2015-09-10 11:27:03.276344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs4_op_layoutget.c 2015-09-10 11:30:09.100344661 -0400 -@@ -547,7 +547,7 @@ - nfsstat4 nfs_status = 0; - - LogEvent(COMPONENT_PNFS, -- "LAYOUTERROR OP %d status %d offset: %lu length: %lu", -+ "LAYOUTERROR OP %d status %d offset: %" PRIu64 " length: %" PRIu64, - arg_LAYOUTERROR4->lea_errors.de_opnum, - arg_LAYOUTERROR4->lea_errors.de_status, - arg_LAYOUTERROR4->lea_offset, -@@ -577,12 +577,12 @@ - nfsstat4 nfs_status = 0; - - LogEvent(COMPONENT_PNFS, -- "LAYOUTSTATS offset %lu length %lu", -+ "LAYOUTSTATS offset %" PRIu64 " length %" PRIu64, - arg_LAYOUTSTATS4->lsa_offset, - arg_LAYOUTSTATS4->lsa_length); - - LogEvent(COMPONENT_PNFS, -- "LAYOUTSTATS read count %u bytes %lu write count %u bytes %lu", -+ "LAYOUTSTATS read count %u bytes %" PRIu64 " write count %u bytes %" PRIu64, - arg_LAYOUTSTATS4->lsa_read.ii_count, - arg_LAYOUTSTATS4->lsa_read.ii_bytes, - arg_LAYOUTSTATS4->lsa_write.ii_count, ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs4_op_read.c.orig 2015-09-10 11:35:03.095344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs4_op_read.c 2015-09-10 12:33:31.070344661 -0400 -@@ -418,7 +418,7 @@ - if (op_ctx->export->MaxOffsetRead < UINT64_MAX) { - LogFullDebug(COMPONENT_NFS_V4, - "Read offset=%" PRIu64 -- " count=%zd MaxOffSet=%" PRIu64, -+ " size=%" PRIu64 " MaxOffSet=%" PRIu64, - offset, size, - op_ctx->export->MaxOffsetRead); - -@@ -710,7 +710,7 @@ - } - done: - LogDebug(COMPONENT_NFS_V4, -- "Status %s hints 0x%X offset %ld count %ld ", -+ "Status %s hints 0x%X offset %" PRIu64 " count %" PRIu64, - nfsstat4_to_str(res_IO_ADVISE->iaa_status), - hints.hints, hints.offset, hints.count); - -@@ -792,7 +792,7 @@ - } - done: - LogDebug(COMPONENT_NFS_V4, -- "Status %s type %d offset %ld ", -+ "Status %s type %d offset %" PRIu64, - nfsstat4_to_str(res_SEEK->sr_status), arg_SEEK->sa_what, - arg_SEEK->sa_offset); - ---- nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs_proto_tools.c.orig 2015-09-10 12:34:47.664344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/Protocols/NFS/nfs_proto_tools.c 2015-09-10 12:35:56.368344661 -0400 -@@ -3715,7 +3715,7 @@ - nfs3_FSALattr_To_PartialFattr(FSAL_attr, &got, Fattr); - if (want & ~got) { - LogCrit(COMPONENT_NFSPROTO, -- "Likely bug: FSAL did not fill in a standard NFSv3 attribute: missing %lx", -+ "Likely bug: FSAL did not fill in a standard NFSv3 attribute: missing %" PRIx64, - want & ~got); - } - -@@ -4206,6 +4206,6 @@ - if (!(attr->mode & S_ISVTX)) - return false; - -- LogDebug(COMPONENT_NFS_V4, "sticky bit is set on %ld", attr->fileid); -+ LogDebug(COMPONENT_NFS_V4, "sticky bit is set on %" PRIi64, attr->fileid); - return true; - } ---- nfs-ganesha-2.3-rc1/src/SAL/nfs4_recovery.c.orig 2015-09-10 10:14:22.739344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/SAL/nfs4_recovery.c 2015-09-10 10:29:20.513344661 -0400 -@@ -66,8 +66,6 @@ - */ - void nfs4_start_grace(nfs_grace_start_t *gsp) - { -- time_t current_time; -- - if (nfs_param.nfsv4_param.graceless) { - LogEvent(COMPONENT_STATE, - "NFS Server skipping GRACE (Graceless is true)"); -@@ -81,8 +79,7 @@ - * seconds Lease_Lifetime should be set to a smaller value for those - * setups. - */ -- current_time = time(NULL); -- atomic_store_uint64_t(¤t_grace, current_time); -+ atomic_store_time_t(¤t_grace, time(NULL)); - - LogEvent(COMPONENT_STATE, "NFS Server Now IN GRACE, duration %d", - (int)nfs_param.nfsv4_param.lease_lifetime); -@@ -220,7 +217,7 @@ - PATH_MAX) > 0) { - /* convert_opaque_value_max_for_dir does not prefix - * the "(:". So we need to do it here */ -- sprintf(cidstr_len, "%ld", strlen(cidstr)); -+ snprintf(cidstr_len, sizeof cidstr_len, "%zd", strlen(cidstr)); - total_len = strlen(cidstr) + strlen(str_client_addr) + 5 + - strlen(cidstr_len); - /* hold both long form clientid and IP */ -@@ -268,7 +265,7 @@ - PATH_MAX) > 0) { - /* convert_opaque_value_max_for_dir does not prefix - * the "(:". So we need to do it here */ -- sprintf(cidstr_len, "%ld", strlen(cidstr)); -+ snprintf(cidstr_len, sizeof cidstr_len, "%zd", strlen(cidstr)); - total_len = strlen(cidstr) + strlen(buf) + 5 + - strlen(cidstr_len); - /* hold both long form clientid and IP */ -@@ -371,7 +368,7 @@ - dentp->d_name[0] != '\x1') { - continue; - } -- sprintf(del_path, "%s/%s", path, dentp->d_name); -+ snprintf(del_path, sizeof del_path, "%s/%s", path, dentp->d_name); - if (unlink(del_path) < 0) { - LogEvent(COMPONENT_CLIENTID, - "unlink of %s failed errno: %d", -@@ -576,7 +573,7 @@ - char lopath[PATH_MAX]; - int fd; - -- sprintf(lopath, "%s/", tgtdir); -+ snprintf(lopath, sizeof lopath, "%s/", tgtdir); - strncat(lopath, dentp->d_name, strlen(dentp->d_name)); - fd = creat(lopath, 0700); - if (fd < 0) { -@@ -613,7 +610,7 @@ - if (del) { - char del_path[PATH_MAX]; - -- sprintf(del_path, "%s/%s", path, dentp->d_name); -+ snprintf(del_path, sizeof del_path, "%s/%s", path, dentp->d_name); - if (unlink(del_path) < 0) { - LogEvent(COMPONENT_CLIENTID, - "unlink of %s failed errno: %d", -@@ -1018,7 +1015,7 @@ - if (dentp->d_name[0] == '\x1') { - char del_path[PATH_MAX]; - -- sprintf(del_path, "%s/%s", parent_path, dentp->d_name); -+ snprintf(del_path, sizeof del_path, "%s/%s", parent_path, dentp->d_name); - if (unlink(del_path) < 0) { - LogEvent(COMPONENT_CLIENTID, - "unlink of %s failed errno: %d", ---- nfs-ganesha-2.3-rc2/src/SAL/nfs4_state_id.c.orig 2015-09-11 18:57:12.988344661 -0400 -+++ nfs-ganesha-2.3-rc2/src/SAL/nfs4_state_id.c 2015-09-11 18:59:07.729344661 -0400 -@@ -370,8 +370,7 @@ - res = ((uint32_t) pkey->state_owner->so_owner.so_nfs4_owner.so_clientid - + (uint32_t) sum + pkey->state_owner->so_owner_len - + (uint32_t) pkey->state_owner->so_type -- + (uint32_t) (uint64_t) pkey->state_entry) -- % (uint32_t) hparam->index_size; -+ + (uintptr_t) pkey->state_entry) % (uint32_t) hparam->index_size; - - if (isDebug(COMPONENT_HASHTABLE)) - LogFullDebug(COMPONENT_STATE, "value = %" PRIu32, res); -@@ -406,7 +405,7 @@ - res = (uint64_t) pkey->state_owner->so_owner.so_nfs4_owner.so_clientid - + (uint64_t) sum + pkey->state_owner->so_owner_len - + (uint64_t) pkey->state_owner->so_type -- + (uint64_t) pkey->state_entry; -+ + (uintptr_t) pkey->state_entry; - - if (isDebug(COMPONENT_HASHTABLE)) - LogFullDebug(COMPONENT_STATE, "rbt = %" PRIu64, res); ---- nfs-ganesha-2.3-rc1/src/support/exports.c.orig 2015-09-10 11:19:42.941344661 -0400 -+++ nfs-ganesha-2.3-rc1/src/support/exports.c 2015-09-10 11:20:44.579344661 -0400 -@@ -818,7 +818,7 @@ - export->fullpath, export->FS_tag, perms); - - LogInfo(COMPONENT_CONFIG, -- "Export %d has %ld defined clients", export->export_id, -+ "Export %d has %zd defined clients", export->export_id, - glist_length(&export->clients)); - put_gsh_export(export); - return 0; diff --git a/nfs-ganesha-2.3rc3-CMakeLists.txt.patch b/nfs-ganesha-2.3rc3-CMakeLists.txt.patch deleted file mode 100644 index b344c0f..0000000 --- a/nfs-ganesha-2.3rc3-CMakeLists.txt.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- nfs-ganesha-2.3-rc2/src/CMakeLists.txt.orig 2015-09-11 19:01:01.530344661 -0400 -+++ nfs-ganesha-2.3-rc2/src/CMakeLists.txt 2015-09-11 19:05:13.269344661 -0400 -@@ -765,9 +765,12 @@ - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/portability_cmake_2.8 /usr/share/cmake/Modules ${CMAKE_MODULE_PATH}) - endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8" ) - -+find_library(LIBNTIRPC ntirpc) -+ -+set(CMAKE_C_FLAGS "-isystem /usr/include/ntirpc ${CMAKE_C_FLAGS}") -+ - include_directories( - "${PROJECT_BINARY_DIR}/include" -- "${PROJECT_SOURCE_DIR}/libntirpc/ntirpc/" - "${PROJECT_SOURCE_DIR}/include" - "${OS_INCLUDE_DIR}" - "${KRB5_INCLUDE_DIRS}" -@@ -783,12 +786,6 @@ - - - #callers add: --# target_link_libraries(your_library ${LIBTIRPC_LIBRARIES}) --set(LIBTIRPC_INCLUDE_DIR -- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc" -- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc/rpc" --) --set(LIBTIRPC_LIBRARIES ntirpc) - - # Find misc system libs - find_library(LIBRT rt) # extended Pthreads functions -@@ -916,6 +913,7 @@ - ${KRB5_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ${LIBRT} -+ ${LIBNTIRPC} - ) - - # Config file; make sure it doesn't clobber an existing one -@@ -926,16 +924,6 @@ - # pre-create PREFIX/var/run/ganesha - install(DIRECTORY DESTINATION ${SYSSTATEDIR}/run/ganesha) - --IF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/ganesha/CMakeLists.txt ) --message( FATAL_ERROR --"No CMakeLists.txt found in libntirpc --This probably means that the directory was not properly populated. --Please run the following command to do that and use cmake again: -- git submodule update --init --Alternatively, if you are not using git, get the current version at -- https://github.com/nfs-ganesha/ntirpc" ) --ENDIF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/ganesha/CMakeLists.txt ) -- - add_subdirectory(log) - add_subdirectory(config_parsing) - add_subdirectory(cidr) -@@ -945,7 +933,6 @@ - add_subdirectory(NodeList) - add_subdirectory(cache_inode) - add_subdirectory(SAL) --add_subdirectory(libntirpc/ganesha) - add_subdirectory(RPCAL) - add_subdirectory(Protocols) - add_subdirectory(support) diff --git a/nfs-ganesha-2.3rc3-scripts-ganeshactl-CMakeLists.txt.patch b/nfs-ganesha-2.3rc3-scripts-ganeshactl-CMakeLists.txt.patch deleted file mode 100644 index fe38545..0000000 --- a/nfs-ganesha-2.3rc3-scripts-ganeshactl-CMakeLists.txt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nfs-ganesha-2.3-rc3/src/scripts/ganeshactl/CMakeLists.txt.orig 2015-09-18 08:12:14.081542533 -0400 -+++ nfs-ganesha-2.3-rc3/src/scripts/ganeshactl/CMakeLists.txt 2015-09-18 08:47:26.199542533 -0400 -@@ -124,6 +124,6 @@ - - install( - CODE -- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON} ${SETUP_PY} install --skip-build --prefix=$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})" -+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON} ${SETUP_PY} install --skip-build --prefix=${DESTDIR}${CMAKE_INSTALL_PREFIX})" - ) - endif(PYTHON) diff --git a/nfs-ganesha-2.3rc4-CMakeLists.txt.patch b/nfs-ganesha-2.3rc4-CMakeLists.txt.patch deleted file mode 100644 index 1cce5ea..0000000 --- a/nfs-ganesha-2.3rc4-CMakeLists.txt.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- nfs-ganesha-2.3-rc4/src/CMakeLists.txt.orig 2015-09-28 09:41:36.169664072 -0400 -+++ nfs-ganesha-2.3-rc4/src/CMakeLists.txt 2015-09-28 09:44:34.120664072 -0400 -@@ -780,9 +780,12 @@ - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/portability_cmake_2.8 /usr/share/cmake/Modules ${CMAKE_MODULE_PATH}) - endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8" ) - -+find_library(LIBNTIRPC ntirpc) -+ -+set(CMAKE_C_FLAGS "-isystem /usr/include/ntirpc ${CMAKE_C_FLAGS}") -+ - include_directories( - "${PROJECT_BINARY_DIR}/include" -- "${PROJECT_SOURCE_DIR}/libntirpc/ntirpc/" - "${PROJECT_SOURCE_DIR}/include" - "${OS_INCLUDE_DIR}" - "${KRB5_INCLUDE_DIRS}" -@@ -798,12 +801,6 @@ - - - #callers add: --# target_link_libraries(your_library ${LIBTIRPC_LIBRARIES}) --set(LIBTIRPC_INCLUDE_DIR -- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc" -- "${PROJECT_BINARY_DIR}/libtirpc/ntirpc/rpc" --) --set(LIBTIRPC_LIBRARIES ntirpc) - - # Find misc system libs - find_library(LIBRT rt) # extended Pthreads functions -@@ -931,6 +928,7 @@ - ${KRB5_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ${LIBRT} -+ ${LIBNTIRPC} - ) - - # Config file; make sure it doesn't clobber an existing one -@@ -941,16 +939,6 @@ - # pre-create PREFIX/var/run/ganesha - install(DIRECTORY DESTINATION ${SYSSTATEDIR}/run/ganesha) - --IF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/ganesha/CMakeLists.txt ) --message( FATAL_ERROR --"No CMakeLists.txt found in libntirpc --This probably means that the directory was not properly populated. --Please run the following command to do that and use cmake again: -- git submodule update --init --Alternatively, if you are not using git, get the current version at -- https://github.com/nfs-ganesha/ntirpc" ) --ENDIF( NOT EXISTS ${PROJECT_SOURCE_DIR}/libntirpc/ganesha/CMakeLists.txt ) -- - add_subdirectory(log) - add_subdirectory(config_parsing) - add_subdirectory(cidr) -@@ -960,7 +948,6 @@ - add_subdirectory(NodeList) - add_subdirectory(cache_inode) - add_subdirectory(SAL) --add_subdirectory(libntirpc/ganesha) - add_subdirectory(RPCAL) - add_subdirectory(Protocols) - add_subdirectory(support) diff --git a/nfs-ganesha-2.3rc5-CMakeLists.txt.patch b/nfs-ganesha-2.3rc5-CMakeLists.txt.patch deleted file mode 100644 index ba6d6d2..0000000 --- a/nfs-ganesha-2.3rc5-CMakeLists.txt.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- nfs-ganesha-2.3-rc5/src/CMakeLists.txt.orig 2015-10-05 07:32:38.294664072 -0400 -+++ nfs-ganesha-2.3-rc5/src/CMakeLists.txt 2015-10-08 14:20:40.238664072 -0400 -@@ -20,7 +20,7 @@ - set(GANESHA_MINOR_VERSION 3) - - # needs to come after project() --IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -+IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR CMAKE_INSTALL_PREFIX STREQUAL "/usr") - SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix for common files" FORCE) - message(STATUS "override default CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") - SET(SYSCONFDIR "/etc" CACHE PATH "Install prefix for common files" FORCE) -@@ -29,7 +29,7 @@ - message(STATUS "was set CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") - SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Install prefix for common files" FORCE) - SET(SYSSTATEDIR "${CMAKE_INSTALL_PREFIX}/var" CACHE PATH "Install prefix for common files" FORCE) --ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -+ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR CMAKE_INSTALL_PREFIX STREQUAL "/usr") - # Patch level is always ".0" for mainline (master). It is blank for development. - # When starting a stable maintenance branch, this becomes ".N" - # where N is monotonically increasing starting at 1. Remember to include the "." !! diff --git a/nfs-ganesha-2.3rc5-include-config-h.in.cmake.patch b/nfs-ganesha-2.3rc5-include-config-h.in.cmake.patch deleted file mode 100644 index a8125b4..0000000 --- a/nfs-ganesha-2.3rc5-include-config-h.in.cmake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-ganesha-2.3-rc5/src/include/config-h.in.cmake.orig 2015-10-08 15:04:29.232664072 -0400 -+++ nfs-ganesha-2.3-rc5/src/include/config-h.in.cmake 2015-10-08 15:04:45.637664072 -0400 -@@ -14,7 +14,7 @@ - #define _GIT_HEAD_COMMIT "@_GIT_HEAD_COMMIT@" - #define _GIT_DESCRIBE "@_GIT_DESCRIBE@" - #define BUILD_HOST "@BUILD_HOST_NAME@" --#define FSAL_MODULE_LOC "@MODULES_PATH@/@FSAL_DESTINATION@" -+#define FSAL_MODULE_LOC "@FSAL_DESTINATION@" - /* Build controls */ - - #cmakedefine _MSPAC_SUPPORT 1 diff --git a/nfs-ganesha-2.3rc5-scripts-ganeshactl-CMakeLists.txt.patch b/nfs-ganesha-2.3rc5-scripts-ganeshactl-CMakeLists.txt.patch deleted file mode 100644 index dd230e3..0000000 --- a/nfs-ganesha-2.3rc5-scripts-ganeshactl-CMakeLists.txt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- nfs-ganesha-2.3-rc5/src/scripts/ganeshactl/CMakeLists.txt.orig 2015-10-06 14:15:53.881664072 -0400 -+++ nfs-ganesha-2.3-rc5/src/scripts/ganeshactl/CMakeLists.txt 2015-10-06 14:16:16.232664072 -0400 -@@ -124,6 +124,6 @@ - - install( - CODE -- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON} ${SETUP_PY} install --skip-build --prefix=$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})" -+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON} ${SETUP_PY} install --skip-build --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})" - ) - endif(PYTHON) diff --git a/nfs-ganesha-2.4dev12-include-nfsv41.patch b/nfs-ganesha-2.4dev12-include-nfsv41.patch deleted file mode 100644 index b9c1570..0000000 --- a/nfs-ganesha-2.4dev12-include-nfsv41.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- nfs-ganesha-2.4-dev-12/src/include/nfsv41.h.orig 2016-03-31 09:24:59.815760250 -0400 -+++ nfs-ganesha-2.4-dev-12/src/include/nfsv41.h 2016-03-31 09:25:38.566760250 -0400 -@@ -3775,7 +3775,7 @@ - return false; - /* skip any further elements and lie on bitmap len */ - for (i = mapsize; i < objp->bitmap4_len; i++) { -- u_int crud; -+ u_int crud = 0; - - if (!inline_xdr_u_int32_t(xdrs, &crud)) - return false; ---- nfs-ganesha-2.4-dev-12/src/FSAL/FSAL_VFS/file.c.orig 2016-03-31 10:02:07.605760250 -0400 -+++ nfs-ganesha-2.4-dev-12/src/FSAL/FSAL_VFS/file.c 2016-03-31 10:04:38.076760250 -0400 -@@ -1918,7 +1918,7 @@ - } - - 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); - -@@ -1973,7 +1973,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(%ld), request_lock_length(%" PRIu64 ")", - lock_args.l_len, request_lock->lock_length); - return fsalstat(ERR_FSAL_BAD_RANGE, 0); - } diff --git a/nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch b/nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch deleted file mode 100644 index 60f892b..0000000 --- a/nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-ganesha-2.4-dev-17/src/FSAL/fsal_helper.c.orig 2016-05-10 07:22:14.695046076 -0400 -+++ nfs-ganesha-2.4-dev-17/src/FSAL/fsal_helper.c 2016-05-10 07:23:13.590046076 -0400 -@@ -1442,7 +1442,7 @@ - status = get_dirent(obj, &cb_parms, cookie, state); - if (status.major == ERR_FSAL_CROSS_JUNCTION) { - struct fsal_obj_handle *junction_obj; -- struct gsh_export *junction_export; -+ struct gsh_export *junction_export = NULL; - - PTHREAD_RWLOCK_rdlock(&obj->state_hdl->state_lock); - diff --git a/nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch b/nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch deleted file mode 100644 index 59f6d0e..0000000 --- a/nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-ganesha-2.4-dev-19/src/FSAL/FSAL_CEPH/handle.c.orig 2016-05-30 08:54:35.653769734 -0400 -+++ nfs-ganesha-2.4-dev-19/src/FSAL/FSAL_CEPH/handle.c 2016-05-30 08:55:35.314769734 -0400 -@@ -233,7 +233,7 @@ - } - - LogFullDebug(COMPONENT_FSAL, -- "Created %s inode %lu Inode %p", -+ "Created %s inode %" PRIu64 " Inode %p", - name, st.st_ino, i); - - construct_handle(&st, i, export, &obj); diff --git a/nfs-ganesha-2.4dev25-FSAL.patch b/nfs-ganesha-2.4dev25-FSAL.patch deleted file mode 100644 index f08f928..0000000 --- a/nfs-ganesha-2.4dev25-FSAL.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- 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 (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 @@ - #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); - } ---- 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); diff --git a/nfs-ganesha-2.4dev29-FSAL.patch b/nfs-ganesha-2.4dev29-FSAL.patch deleted file mode 100644 index 4a781b0..0000000 --- a/nfs-ganesha-2.4dev29-FSAL.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- nfs-ganesha-2.4-dev-29/src/FSAL/FSAL_VFS/handle.c.orig 2016-08-15 13:40:03.546478618 -0400 -+++ nfs-ganesha-2.4-dev-29/src/FSAL/FSAL_VFS/handle.c 2016-08-15 13:47:10.254478618 -0400 -@@ -32,6 +32,7 @@ - - #include "config.h" - -+#include /* for makedev(3) */ - #include /* used for 'dirname' */ - #include - #include ---- nfs-ganesha-2.4-dev-29/src/FSAL/FSAL_CEPH/handle.c.orig 2016-08-15 13:45:20.288478618 -0400 -+++ nfs-ganesha-2.4-dev-29/src/FSAL/FSAL_CEPH/handle.c 2016-08-15 13:46:43.061478618 -0400 -@@ -31,6 +31,7 @@ - * fsal_obj_handle type. - */ - -+#include /* for makedev(3) */ - #include - #include - #include "fsal.h" ---- nfs-ganesha-2.4-dev-29/src/FSAL/FSAL_GLUSTER/handle.c.orig 2016-08-15 13:46:00.312478618 -0400 -+++ nfs-ganesha-2.4-dev-29/src/FSAL/FSAL_GLUSTER/handle.c 2016-08-15 13:46:54.820478618 -0400 -@@ -21,6 +21,7 @@ - * ------------- - */ - -+#include /* for makedev(3) */ - #include - #include "fsal.h" - #include "gluster_internal.h" ---- nfs-ganesha-2.4-dev-29/src/FSAL/fsal_convert.c.orig 2016-08-16 06:40:41.950478618 -0400 -+++ nfs-ganesha-2.4-dev-29/src/FSAL/fsal_convert.c 2016-08-16 06:42:02.135478618 -0400 -@@ -9,6 +9,7 @@ - */ - - #include "config.h" -+#include /* for major(3), minor(3) */ - #include - #include - #include ---- nfs-ganesha-2.4-dev-29/src/FSAL/commonlib.c.orig 2016-08-16 07:34:13.138478618 -0400 -+++ nfs-ganesha-2.4-dev-29/src/FSAL/commonlib.c 2016-08-16 07:34:54.822478618 -0400 -@@ -41,6 +41,7 @@ - #include "config.h" - - #include /* avoid conflicts with sys/queue.h */ -+#include /* for major(3), minor(3) */ - #include /* used for 'dirname' */ - #include - #include diff --git a/nfs-ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch b/nfs-ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch deleted file mode 100644 index 4ce0ef0..0000000 --- a/nfs-ganesha-2.4dev7-FSAL-FSAL_CEPHFS-mds.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- nfs-ganesha-2.4-dev-7/src/FSAL/FSAL_CEPH/internal.h.orig 2016-02-06 01:14:25.567869468 -0500 -+++ nfs-ganesha-2.4-dev-7/src/FSAL/FSAL_CEPH/internal.h 2016-02-06 01:15:51.655869468 -0500 -@@ -123,14 +123,6 @@ - extern attrmask_t settable_attributes; - #endif /* !CEPH_INTERNAL_C */ - --/** -- * Linux supports a stripe pattern with no more than 4096 stripes, but -- * for now we stick to 1024 to keep them da_addrs from being too -- * gigantic. -- */ -- --static const size_t BIGGEST_PATTERN = 1024; -- - /* private helper for export object */ - - static inline fsal_staticfsinfo_t *ceph_staticinfo(struct fsal_module *hdl) ---- nfs-ganesha-2.4-dev-7/src/FSAL/FSAL_CEPH/mds.c.orig 2016-02-06 01:15:20.154869468 -0500 -+++ nfs-ganesha-2.4-dev-7/src/FSAL/FSAL_CEPH/mds.c 2016-02-06 01:36:01.443869468 -0500 -@@ -34,6 +34,14 @@ - #ifdef CEPH_PNFS - - /** -+ * Linux supports a stripe pattern with no more than 4096 stripes, but -+ * for now we stick to 1024 to keep them da_addrs from being too -+ * gigantic. -+ */ -+ -+static const size_t BIGGEST_PATTERN = 1024; -+ -+/** - * @file FSAL_CEPH/mds.c - * @author Adam C. Emerson - * @date Wed Oct 22 13:24:33 2014 diff --git a/nfs-ganesha-2.4dev7-RPCAL-rpc_tools.patch b/nfs-ganesha-2.4dev7-RPCAL-rpc_tools.patch deleted file mode 100644 index 1601208..0000000 --- a/nfs-ganesha-2.4dev7-RPCAL-rpc_tools.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- nfs-ganesha-2.4-dev-7/src/RPCAL/rpc_tools.c.orig 2016-02-05 04:11:00.005869468 -0500 -+++ nfs-ganesha-2.4-dev-7/src/RPCAL/rpc_tools.c 2016-02-05 04:19:04.300869468 -0500 -@@ -116,6 +116,10 @@ - return "sctp"; - case XPRT_RDMA: - return "rdma"; -+ case XPRT_VSOCK: -+ return "vsock"; -+ case XPRT_VSOCK_RENDEZVOUS: -+ return "vsock rendezvous"; - } - return "INVALID"; - } diff --git a/nfs-ganesha-2.4dev7-SAL-9p_owner.patch b/nfs-ganesha-2.4dev7-SAL-9p_owner.patch deleted file mode 100644 index ea55bc8..0000000 --- a/nfs-ganesha-2.4dev7-SAL-9p_owner.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-ganesha-2.4-dev-7/src/SAL/9p_owner.c.orig 2016-02-06 04:16:28.354869468 -0500 -+++ nfs-ganesha-2.4-dev-7/src/SAL/9p_owner.c 2016-02-06 04:17:01.382869468 -0500 -@@ -238,7 +238,7 @@ - (uint64_t)paddr->sin_addr.s_addr; - - if (isDebug(COMPONENT_HASHTABLE)) -- LogFullDebug(COMPONENT_STATE, "rbt = %lu", res); -+ LogFullDebug(COMPONENT_STATE, "rbt = %" PRIu64 , res); - - return res; - } diff --git a/nfs-ganesha-2.4rc1-FSAL.patch b/nfs-ganesha-2.4rc1-FSAL.patch deleted file mode 100644 index b311a45..0000000 --- a/nfs-ganesha-2.4rc1-FSAL.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_CEPH/handle.c.orig 2016-08-29 12:24:44.350041751 -0400 -+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_CEPH/handle.c 2016-08-29 13:42:12.502041751 -0400 -@@ -31,6 +31,7 @@ - * fsal_obj_handle type. - */ - -+#include "config.h" - #ifdef LINUX - #include /* for makedev(3) */ - #endif ---- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_GLUSTER/handle.c.orig 2016-08-29 12:25:01.223041751 -0400 -+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_GLUSTER/handle.c 2016-08-29 13:42:34.090041751 -0400 -@@ -21,6 +21,7 @@ - * ------------- - */ - -+#include "config.h" - #ifdef LINUX - #include /* for makedev(3) */ - #endif diff --git a/nfs-ganesha-2.4rc3-FSAL_RGW.handle.patch b/nfs-ganesha-2.4rc3-FSAL_RGW.handle.patch deleted file mode 100644 index ede428b..0000000 --- a/nfs-ganesha-2.4rc3-FSAL_RGW.handle.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- nfs-ganesha-2.4-rc3/src/FSAL/FSAL_RGW/handle.c.orig 2016-09-07 13:45:17.387742345 -0400 -+++ nfs-ganesha-2.4-rc3/src/FSAL/FSAL_RGW/handle.c 2016-09-07 14:09:26.241742345 -0400 -@@ -238,7 +238,7 @@ - RGW_SETATTR_UID | RGW_SETATTR_GID | RGW_SETATTR_MODE; - - rc = rgw_create(export->rgw_fs, dir->rgw_fh, name, &st, create_mask, -- &rgw_fh, 0 /* posix flags */, RGW_CREATE_FLAG_NONE); -+ &rgw_fh, RGW_CREATE_FLAG_NONE); - if (rc < 0) - return rgw2fsal_error(rc); - -@@ -771,8 +771,7 @@ - PTHREAD_RWLOCK_wrlock(&obj_hdl->lock); - } - -- rc = rgw_open(export->rgw_fs, handle->rgw_fh, posix_flags, -- (!state) ? RGW_OPEN_FLAG_V3 : RGW_OPEN_FLAG_NONE); -+ rc = rgw_open(export->rgw_fs, handle->rgw_fh, RGW_OPEN_FLAG_NONE); - - if (rc < 0) { - if (!state) { -@@ -922,7 +921,7 @@ - RGW_SETATTR_UID | RGW_SETATTR_GID | RGW_SETATTR_MODE; - - rc = rgw_create(export->rgw_fs, handle->rgw_fh, name, &st, create_mask, -- &rgw_fh, posix_flags, RGW_CREATE_FLAG_NONE); -+ &rgw_fh, RGW_CREATE_FLAG_NONE); - if (rc < 0) { - LogFullDebug(COMPONENT_FSAL, - "Create %s failed with %s", -@@ -938,8 +937,7 @@ - */ - posix_flags &= ~O_EXCL; - rc = rgw_create(export->rgw_fs, handle->rgw_fh, name, &st, -- create_mask, &rgw_fh, posix_flags, -- RGW_CREATE_FLAG_NONE); -+ create_mask, &rgw_fh, RGW_CREATE_FLAG_NONE); - - if (rc < 0) { - LogFullDebug(COMPONENT_FSAL, -@@ -984,8 +982,7 @@ - - *new_obj = &obj->handle; - -- rc = rgw_open(export->rgw_fs, rgw_fh, posix_flags, -- (!state) ? RGW_OPEN_FLAG_V3 : RGW_OPEN_FLAG_NONE); -+ rc = rgw_open(export->rgw_fs, rgw_fh, RGW_OPEN_FLAG_NONE); - - if (rc < 0) { - goto fileerr; -@@ -1163,8 +1160,6 @@ - * 9P does, V3 does not */ - - int rc = rgw_open(export->rgw_fs, handle->rgw_fh, -- posix_flags, -- (!state) ? RGW_OPEN_FLAG_V3 : - RGW_OPEN_FLAG_NONE); - - if (rc < 0) { -@@ -1345,8 +1340,8 @@ - handle); - - LogFullDebug(COMPONENT_FSAL, -- "%s enter obj_hdl %p offset %"PRIx64" length %"PRIx64, -- __func__, obj_hdl, offset, len); -+ "%s enter obj_hdl %p offset %"PRIx64" length %zx", -+ __func__, obj_hdl, (uint64_t) offset, len); - - rc = rgw_fsync(export->rgw_fs, handle->rgw_fh, RGW_FSYNC_FLAG_NONE); - if (rc < 0) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 2b7a865..d177730 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -188,8 +188,8 @@ BuildRequires: PyQt4-devel Requires: PyQt4 %endif %endif -BuildRequires: python-devel -Requires: nfs-ganesha = %{version}-%{release}, python +BuildRequires: python2-devel +Requires: nfs-ganesha = %{version}-%{release}, python2 %description utils This package contains utility scripts for managing the NFS-GANESHA server @@ -521,7 +521,7 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %if %{with utils} %files utils -%if ( 0%{?suse_version} || 0%{?fedora} ) +%if ( 0%{?suse_version} ) %{python_sitelib}/Ganesha/* %{python_sitelib}/ganeshactl-*-info %else @@ -547,6 +547,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %endif %changelog +* Wed Jan 18 2017 Kaleb S. KEITHLEY +- python2 (vs. python3) cleanup + * Fri Dec 23 2016 Kaleb S. KEITHLEY 2.4.1-2 - nfs-ganesha 2.4.1 w/ FSAL_RGW