Compare commits

..

218 Commits
f23 ... rawhide

Author SHA1 Message Date
Fedora Release Engineering
2247731166 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 00:32:36 +00:00
Kaleb S. KEITHLEY
1d3eea3550 Rebuilt for pyparsing-3.0.9, ceph w/ fmt-9
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2022-07-19 09:59:38 -04:00
Zbigniew Jędrzejewski-Szmek
f9b55e0398 Rebuilt for pyparsing-3.0.9 2022-07-19 11:12:47 +02:00
Python Maint
5c580d2bd9 Rebuilt for Python 3.11 2022-06-15 18:15:36 +02:00
Karolina Surma
7e4703a16c Fix bogus date in %%changelog 2022-03-04 11:20:47 +01:00
Karolina Surma
05d91f058c Fix build with cmake 3.23.0rc2 2022-03-04 11:18:12 +01:00
Karolina Surma
bb5c7d05d7 Don't BR setuptools, use Python's bundled distutils 2022-03-04 11:12:01 +01:00
Kaleb S. KEITHLEY
81fb321f45 NFS-Ganesha 4.1, w/ modern linker (mold), this time for real
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2022-01-28 08:20:10 -05:00
Kaleb S. KEITHLEY
924bfb7714 NFS-Ganesha 4.1, w/ modern linker (mold), this time for real
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2022-01-28 07:42:17 -05:00
Kaleb S. KEITHLEY
d15b9bb2b3 NFS-Ganesha 4.0, w/ modern linker (mold)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2022-01-26 17:18:07 -05:00
Fedora Release Engineering
ef6ab3fb62 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 21:10:39 +00:00
Kaleb S. KEITHLEY
fb6e3e1938 NFS-Ganesha 4.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-12-21 17:16:59 -05:00
Kaleb S. KEITHLEY
9961703bbf NFS-Ganesha 4.0 RC6
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-12-17 09:09:04 -05:00
Kaleb S. KEITHLEY
047b685db6 NFS-Ganesha 4.0 RC4, w/ utils and gui_utils (python)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-11-17 09:48:47 -05:00
Kaleb S. KEITHLEY
66fd3679e7 NFS-Ganesha 4.0 RC4
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-11-17 07:48:06 -05:00
Kaleb S. KEITHLEY
9caf1185dd NFS-Ganesha 4.0 RC3
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-11-09 15:00:28 -05:00
Fedora Release Engineering
4211c1b372 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 16:06:26 +00:00
Lars Kellogg-Stedman
0627c77bf2 make nfs-ganesha depend on dbus-tools
the nfs-ganesha.service unit requires dbus-send (from the dbus-tools
package) in its ExecStop operation.
2021-07-16 21:18:27 -04:00
Kaleb S. KEITHLEY
200e7b67e5 Rebuilt for userspace-rcu-0.13 again
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-06-22 09:23:18 -04:00
Kaleb S. KEITHLEY
df8718b521 - Rebuilt for libntirpc-3.5
- plus https://src.fedoraproject.org/rpms/nfs-ganesha/pull-request/2
2021-06-16 08:42:34 -04:00
Kaleb S. KEITHLEY
32896262e9 Rebuilt for userspace-rcu-0.13
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-06-08 15:40:40 -04:00
Python Maint
820b3b0f74 Rebuilt for Python 3.10 2021-06-04 20:12:51 +02:00
Zbigniew Jędrzejewski-Szmek
d42f7eb3a0 Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
2021-03-02 16:13:18 +01:00
Kaleb S KEITHLEY
595ee3906f NFS-Ganesha 3.5, rebuild with ceph-16
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
2021-02-09 11:22:01 -05:00
Kaleb S KEITHLEY
7f92338962 NFS-Ganesha 3.5 GA
fix for compiling with Ceph-16 (pacific)

Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
2021-01-28 14:19:07 -05:00
Fedora Release Engineering
3e84f439a2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 21:29:56 +00:00
Kaleb S KEITHLEY
bf71e90723 NFS-Ganesha 3.4 GA
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
2020-12-24 08:19:55 -05:00
Kaleb S. KEITHLEY
14466c6a6e BuildRequires: make
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-11-05 13:44:36 -05:00
Kaleb S. KEITHLEY
3b2b58f384 BuildRequires: make
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-11-05 13:43:16 -05:00
Fedora Release Engineering
ab19725f23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 09:08:01 +00:00
Kaleb S. KEITHLEY
a4ec89c0bb use cmake_build and
DESTDIR="/home/kkeithle/rpmbuild/BUILDROOT/nfs-ganesha-3.3-6.fc33.x86_64" /usr/bin/cmake --install "."

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-07-20 18:50:27 -04:00
Kaleb S. KEITHLEY
542de333e7 use /usr/bin/make install DESTDIR=/home/kkeithle/rpmbuild/BUILDROOT/nfs-ganesha-3.3-5.fc33.x86_64 INSTALL="/usr/bin/install -p"
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-07-20 17:32:17 -04:00
Kaleb S. KEITHLEY
a49b203422 use /usr/bin/make install DESTDIR=/home/kkeithle/rpmbuild/BUILDROOT/nfs-ganesha-3.3-5.fc33.x86_64 INSTALL="/usr/bin/install -p"
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-07-20 17:17:06 -04:00
Kaleb S. KEITHLEY
d96da186eb rpc-statd.conf.el8
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-07-13 08:31:14 -04:00
Kaleb S. KEITHLEY
165b431299 explicit BuildRequires: python3-setuptools
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-06-23 13:14:09 -04:00
Kaleb S. KEITHLEY
bc813f3e27 rhbz#1848208
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-06-18 13:05:47 -04:00
Kaleb S. KEITHLEY
9d6efd5167 rhbz#1848208
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-06-18 09:50:32 -04:00
Kaleb S. KEITHLEY
3ef69e3bfe NFS-Ganesha 3.3 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-06-08 19:22:54 -04:00
Miro Hrončok
88c1030d09 Rebuilt for Python 3.9 2020-05-26 02:54:07 +02:00
Kaleb S. KEITHLEY
293ee2225d NFS-Ganesha 3.2, NFSv4-compound-op-fails SEGV
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-03-23 11:23:00 -04:00
Kaleb S. KEITHLEY
8010aac0ae NFS-Ganesha 3.2, /var/log/ganesha, rhbz#1805493
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-02-20 16:48:26 -05:00
Fedora Release Engineering
6f0b4e91c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 14:57:14 +00:00
Kaleb S. KEITHLEY
abe97aa180 NFS-Ganesha 3.2, gcc-10
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-01-23 07:22:29 -05:00
Kaleb S. KEITHLEY
9825f8b96a NFS-Ganesha 3.2 GA
3.1 was not built

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-12-22 08:43:35 -05:00
Kaleb S. KEITHLEY
ab2d212e63 python3-qt5-devel
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-12-18 21:06:44 -05:00
Kaleb S. KEITHLEY
3e3ebff950 fix typo in ceph
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-12-18 20:35:07 -05:00
Kaleb S. KEITHLEY
4f6f7afe3b NFS-Ganesha 3.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-12 08:56:51 -05:00
Kaleb S. KEITHLEY
936882ed73 nfs-ganesha 3.0 RC5, rebuild w/ libntirpc-3.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-06 15:25:31 -05:00
Kaleb S. KEITHLEY
b5d9744c39 nfs-ganesha 3.0 RC5, enable fsal_mem (again)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-05 07:21:24 -05:00
Kaleb S. KEITHLEY
cfc02de73c nfs-ganesha 3.0 RC5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-04 06:40:20 -05:00
Kaleb S. KEITHLEY
2d0d6b1a89 nfs-ganesha 3.0 RC5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-04 06:22:43 -05:00
Kaleb S. KEITHLEY
de44192b1b nfs-ganesha 3.0 RC5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-04 06:20:19 -05:00
Kaleb S. KEITHLEY
79bb7eee69 nfs-ganesha 3.0 RC5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-03 16:45:58 -05:00
Kaleb S. KEITHLEY
75adf590e8 PyQt4 -> PyQt5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-09-25 10:03:44 -04:00
Miro Hrončok
a89e515064 Rebuilt for Python 3.8 2019-08-19 19:11:32 +02:00
Miro Hrončok
062930bf70 Rebuilt for Python 3.8 2019-08-19 10:20:44 +02:00
Kaleb S. KEITHLEY
6af7ffe044 nfs-ganesha 2.8.2 (f32/rawhide)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-08-14 18:28:05 -04:00
Kaleb S. KEITHLEY
d81a79c315 nfs-ganesha 2.8.2 (f32/rawhide)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-08-14 10:21:57 -04:00
Kaleb S. KEITHLEY
bbd24ff058 nfs-ganesha 2.8.2, #1741023
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-08-14 10:04:31 -04:00
Fedora Release Engineering
70b648dfcd - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 18:38:21 +00:00
Kaleb S. KEITHLEY
ff07091c53 nfs-ganesha 2.8.2 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-23 11:46:06 -04:00
Kaleb S. KEITHLEY
fc814435ed nfs-ganesha 2.8.2 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-23 11:45:27 -04:00
Kaleb S. KEITHLEY
513f8799eb nfs-ganesha 2.8.2 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-23 07:53:25 -04:00
Kaleb S. KEITHLEY
78e8f49df4 nfs-ganesha 2.8.1 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-02 16:28:32 -04:00
Kaleb S. KEITHLEY
07543d66ee nfs-ganesha 2.8.0.3
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-01 08:19:37 -04:00
Kaleb S. KEITHLEY
d8b0c47aad nfs-ganesha 2.8.0, 2.8.0.3
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-01 07:52:02 -04:00
Kaleb S. KEITHLEY
86b7cde6b7 nfs-ganesha 2.8.0, 2.8.0.2
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-06-16 11:27:27 -04:00
Kaleb S. KEITHLEY
b8c02c80a0 nfs-ganesha 2.8.0, 2.8.0.2
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-06-16 11:26:49 -04:00
Kaleb S. KEITHLEY
f628f3d066 nfs-ganesha 2.8.0, 2.8.0.1
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-06-11 13:45:20 -04:00
Kaleb S. KEITHLEY
def82dfa51 nfs-ganesha 2.8.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-06-01 08:24:22 -04:00
Kaleb S. KEITHLEY
a00bf8e864 nfs-ganesha 2.8.0 RC1, utils and gui_utils enabled
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-05-31 11:12:59 -04:00
Kaleb S. KEITHLEY
509613b1a7 nfs-ganesha 2.8.0 RC1, utils and gui_utils disabled until the python
byte_compile problems can be resolved

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-05-30 18:09:29 -04:00
Kaleb S. KEITHLEY
418b8af108 nfs-ganesha 2.8.0 RC1, utils and gui_utils disabled until the python
byte_compile problems can be resolved

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-05-30 18:07:08 -04:00
Miro Hrončok
022276c49e Avoid unversioned Python requires 2019-05-17 22:46:11 +02:00
Kaleb S. KEITHLEY
d73e4a2278 nfs-ganesha 2.7.3, enable utils w/ python2 on f30 and up
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-05-16 11:37:31 -04:00
Kaleb S. KEITHLEY
c19e20e90e nfs-ganesha 2.7.3, selinux bz#1706462
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-05-10 14:10:07 -04:00
Kaleb S. KEITHLEY
7ed9144fc2 nfs-ganesha 2.7.3 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-04-05 10:10:31 -04:00
Kaleb S. KEITHLEY
28bfca8b95 nfs-ganesha 2.7.3 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-04-05 09:22:41 -04:00
Kaleb S. KEITHLEY
18cd2f5bf7 nfs-ganesha 2.7.2 reenable ceph, rgw, rados from bad merge
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-03-11 12:43:35 -04:00
Kaleb S. KEITHLEY
0ef87e820b nfs-ganesha 2.7.2 reenable ceph, rgw, rados from bad merge
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-03-11 12:37:16 -04:00
Kaleb S. KEITHLEY
0c742b18ec nfs-ganesha 2.7.2 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-02-27 10:38:50 -05:00
Kaleb S. KEITHLEY
b0fd3e3246 rebuild for f31/rawhide
add libnsl2-devel on rhel8
 eliminate redundant cmake -DDSANITIZE_ADDRESS=OFF

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-02-21 17:37:59 -05:00
Fedora Release Engineering
4b51389cab - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 12:19:18 +00:00
Igor Gnatenko
1e5501946e Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:18 +01:00
Kaleb S. KEITHLEY
e2b082d005 nfs-ganesha 2.7.1, fix selinux
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-12-19 08:25:47 -05:00
Kaleb S. KEITHLEY
c1ed297730 nfs-ganesha 2.7.1, rebuild w/ ceph-14
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-12-07 15:07:08 -05:00
Kaleb S. KEITHLEY
ce7655b8e8 nfs-ganesha 2.7.1, rebuild w/ ceph-14
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-12-07 14:37:57 -05:00
Kaleb S. KEITHLEY
5938cd0116 nfs-ganesha 2.7.1, rebuild w/ libntirpc-1.7.1-1
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-10-16 11:08:34 -04:00
Kaleb S. KEITHLEY
1aca25ecc2 nfs-ganesha 2.7.1 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-10-14 09:34:44 -04:00
Kaleb S. KEITHLEY
74231f2de2 nfs-ganesha 2.7.0, obsolete xfs, enable lttng
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-09-20 10:48:06 -04:00
Kaleb S. KEITHLEY
728473a63c nfs-ganesha 2.7.0, obsolete xfs, enable lttng
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-09-20 10:31:31 -04:00
Kaleb S. KEITHLEY
65db5435fb nfs-ganesha 2.7.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-09-17 09:01:09 -04:00
Kaleb S. KEITHLEY
42f662bec2 nfs-ganesha 2.6.3 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-08-22 11:25:11 -04:00
Petr Lautrbach
bcd493e99b Require the correct package with /usr/sbin/semanage
/usr/sbin/semanage tool is shipped by policycoreutils-python in Red Hat
Enterprise Linux, but it was moved to policycoreutils-python-utils in Fedora
2018-08-10 09:57:34 +02:00
Igor Gnatenko
3380c42015
python-devel → python2-devel
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-29 23:39:13 +02:00
Igor Gnatenko
00e0072a42
%{python_sitelib} → %{python2_sitelib}
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-29 23:11:28 +02:00
Kaleb S. KEITHLEY
e796917a2d disable utils, python
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-07-17 11:58:24 -04:00
Fedora Release Engineering
51b22e8610 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 11:35:21 +00:00
Kaleb S. KEITHLEY
26760bb154 defattr
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-07-03 15:39:07 -04:00
Kaleb S. KEITHLEY
5c8952e684 nfs-ganesha 2.6.2 w/ ceph and rgw FSALs
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-05-16 09:49:54 -04:00
Kaleb S. KEITHLEY
14f2b8c96f nfs-ganesha 2.6.2 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-05-10 13:39:05 -04:00
Kaleb S. KEITHLEY
fa4ed37765 nfs-ganesha 2.6.1 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-03-20 11:24:55 -04:00
Kaleb S. KEITHLEY
dc3646458c nfs-ganesha 2.6.0 GA, rebuild (relink) with libntirpc-1.6.1
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-03-02 07:25:19 -05:00
Kaleb S. KEITHLEY
877078d3bf nfs-ganesha 2.6.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-02-20 08:14:05 -05:00
Kaleb S. KEITHLEY
9ca2f2d540 nfs-ganesha 2.6.0 RC5, rebuild with libntirpc-1.6.1
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-02-20 06:01:51 -05:00
Kaleb S. KEITHLEY
7b79460bf0 nfs-ganesha 2.6.0 RC5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-02-09 07:27:23 -05:00
Fedora Release Engineering
7e45282fed - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 04:11:01 +00:00
Kaleb S. KEITHLEY
d15d4f6e00 nfs-ganesha 2.6.0 RC3
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-01-19 09:00:46 -05:00
Kaleb S. KEITHLEY
fbbaa05230 nfs-ganesha 2.6.0 RC2
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-01-17 14:32:41 -05:00
Kaleb S. KEITHLEY
f11e61c580 rebuild with libnfsidmap (libnfsidmap.so.1)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-01-11 15:38:11 -05:00
Kaleb S. KEITHLEY
75d133c12c nfs-ganesha 2.5.4 GA 2017-11-13 14:28:54 -05:00
Kaleb S. KEITHLEY
0f11624b71 nfs-ganesha 2.5.3, quiet semanage 2017-10-20 12:54:58 -04:00
Kaleb S. KEITHLEY
1dc8241f13 nfs-ganesha 2.5.3, fix semanage in %post 2017-10-20 12:47:58 -04:00
Kaleb S. KEITHLEY
a98844adc4 nfs-ganesha 2.5.3 GA 2017-10-10 14:21:42 -04:00
Kaleb S. KEITHLEY
0e04457657 nfs-ganesha 2.5.3 GA 2017-10-10 09:49:19 -04:00
Kaleb S. KEITHLEY
474e44d1ac /var/log/ganesha -> ganesha_var_log_t
see https://github.com/nfs-ganesha/nfs-ganesha/issues/212
2017-09-27 07:19:24 -04:00
Kaleb S. KEITHLEY
d05aff4352 /var/log/ganesha -> ganesha_var_log_t
see https://github.com/nfs-ganesha/nfs-ganesha/issues/212
2017-09-22 15:30:33 -04:00
Kaleb S. KEITHLEY
ce0cac8bbe /var/log/ganesha owner ganesha.ganesha -> ganesha.root
see https://github.com/nfs-ganesha/nfs-ganesha/issues/212
2017-09-22 09:21:05 -04:00
Kaleb S. KEITHLEY
efb2febf03 nfs-ganesha 2.5.2 GA 2017-08-28 13:37:45 -04:00
Kaleb S. KEITHLEY
cbd714c6ef no rdma on arm(v7hl), FSAL_RGW, FSAL_CEPH; with ceph-12-1.4-5 2017-08-25 13:13:31 -04:00
Kaleb S. KEITHLEY
9f41a4ca0f no rdma on arm(v7hl), thus no rgw in ceph, hence no FSAL_RGW 2017-08-24 10:34:53 -04:00
Kaleb S. KEITHLEY
3029cca49a nfs-ganesha 2.5.2 GA 2017-08-24 09:21:29 -04:00
Kaleb S. KEITHLEY
32ba49ab2a /var/run -> /run 2017-08-18 13:57:40 -04:00
Kaleb S. KEITHLEY
14b51ae79c nfs-ganesha 2.5.1.1 GA
enable ppc64, enable FSAL_GPFS
2017-08-04 13:13:53 -04:00
Kaleb S. KEITHLEY
0cbafc6f02 nfs-ganesha 2.5.1.1 GA
enable ppc64, enable FSAL_GPFS
2017-08-03 09:30:28 -04:00
Kaleb S. KEITHLEY
b85803fad4 nfs-ganesha 2.5.1 w/ FSAL_CEPH and FSAL_RGW on i686, armv7hl 2017-07-31 08:22:52 -04:00
Fedora Release Engineering
6b492c5817 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 22:55:09 +00:00
Kaleb S. KEITHLEY
a170b7fc78 nfs-ganesha 2.5.1 w/ FSAL_RGW 2017-07-25 08:14:57 -04:00
Kaleb S. KEITHLEY
e5f872ff52 nfs-ganesha 2.5.1 w/ FSAL_RGW 2017-07-25 08:06:11 -04:00
Kaleb S. KEITHLEY
a58d1bc4cd nfs-ganesha 2.5.1 w/ ceph-12.1.1 2017-07-24 15:57:32 -04:00
Kaleb S. KEITHLEY
7f85a340c7 nfs-ganesha 2.5.1 w/ ceph-12.1.1 2017-07-24 15:15:14 -04:00
Kaleb S. KEITHLEY
d554e7ce72 nfs-ganesha 2.5.1 GA 2017-07-22 06:52:34 -04:00
Kaleb S. KEITHLEY
2bc3ae1b1f nfs-ganesha 2.5.1 GA 2017-07-21 22:35:04 -04:00
Kaleb S. KEITHLEY
6a7437ed79 nfs-ganesha 2.5.0 w/ libntirpc-1.5.3 2017-07-19 14:05:03 -04:00
Kaleb S. KEITHLEY
a9d34ca357 nfs-ganesha 2.5.0 w/ libntirpc-1.5.3 2017-07-19 13:45:43 -04:00
Kaleb S. KEITHLEY
5e04aa1acd nfs-ganesha 2.5.0 rebuild with libntirpc-1.5.3 2017-07-19 13:23:46 -04:00
Kaleb S. KEITHLEY
c046aad3c5 nfs-ganesha 2.5.0 rebuild with ceph 2017-06-27 09:31:32 -04:00
Kaleb S. KEITHLEY
8b3fa92254 nfs-ganesha 2.5.0 rebuild with userspace-rcu-0.10.0 (liburcu-bp.so.6) 2017-06-25 18:44:52 -04:00
Kaleb S. KEITHLEY
f2f6dd4571 nfs-ganesha 2.5.0 GA 2017-06-12 13:29:19 -04:00
Kaleb S. KEITHLEY
e97bb47964 nfs-ganesha 2.5.0 GA 2017-06-12 12:25:02 -04:00
Kaleb S. KEITHLEY
9fa6588925 nfs-ganesha 2.5 final 2017-06-07 01:54:32 -04:00
Kaleb S. KEITHLEY
417adbba62 nfs-ganesha 2.5 rc8, with libntirpc-1.5.2 2017-06-06 02:01:48 -04:00
Kaleb S. KEITHLEY
92b66aed92 nfs-ganesha 2.5 rc8, with libntirpc-1.5.2 2017-05-30 18:25:04 -04:00
Kaleb S. KEITHLEY
46a5515e98 nfs-ganesha 2.5rc7 2017-05-22 08:30:59 -04:00
Kaleb S. KEITHLEY
6c45a417d1 rebuild with libntirpc-1.4.4 2017-05-16 15:32:38 -04:00
Kaleb S. KEITHLEY
b8570f7f58 nfs-ganesha 2.5rc6 2017-05-14 17:55:15 -04:00
Kaleb S. KEITHLEY
0ccf11e5e8 nfs-ganesha 2.5rc6 2017-05-14 17:54:49 -04:00
Kaleb S. KEITHLEY
2374aacdbe nfs-ganesha 2.5rc5 2017-05-11 07:23:09 -04:00
Kaleb S. KEITHLEY
23164b9062 rebuild with libntirpc-1.5.1 2017-05-11 07:18:28 -04:00
Kaleb S. KEITHLEY
8a9dc58eb5 nfs-ganesha 2.5rc4 2017-05-08 07:21:22 -04:00
Kaleb S. KEITHLEY
6368c27d68 nfs-ganesha 2.5rc4 2017-05-08 06:44:21 -04:00
Kaleb S. KEITHLEY
2c451eb2c5 nfs-ganesha 2.5rc3 2017-05-01 10:45:21 -04:00
Kaleb S. KEITHLEY
59466f6b5c nfs-ganesha 2.5rc2 2017-04-22 08:38:40 -04:00
Kaleb S. KEITHLEY
f1b81b7b15 nfs-ganesha 2.4.5 GA, w/ RGW again (cephfs-10.2.7) 2017-04-19 14:06:33 -04:00
Kaleb S. KEITHLEY
bfd42fc375 nfs-ganesha 2.4.5 GA, w/ RGW again (cephfs-10.2.7) 2017-04-19 13:43:37 -04:00
Kaleb S. KEITHLEY
70d150de9e nfs-ganesha 2.4.5 GA 2017-04-05 10:54:01 -04:00
Kaleb S. KEITHLEY
066e64aa67 nfs-ganesha 2.4.5 GA 2017-04-05 09:50:22 -04:00
Kaleb S. KEITHLEY
b690a420d5 nfs-ganesha 2.4.4 GA 2017-03-21 09:16:18 -04:00
Kaleb S. KEITHLEY
cc278f54eb nfs-ganesha 2.4.4 GA 2017-03-21 08:45:31 -04:00
Kaleb S. KEITHLEY
054ad8b2e7 nfs-ganesha 2.4.3 GA, reenable FSAL_CEPH and FSAL_RGW 2017-02-24 15:31:02 -05:00
Kaleb S. KEITHLEY
e157f3a27c nfs-ganesha 2.4.3 GA, reenable FSAL_CEPH and FSAL_RGW 2017-02-10 16:35:30 -05:00
Kaleb S. KEITHLEY
9d32049077 nfs-ganesha 2.4.3 GA 2017-02-08 08:10:25 -05:00
Kaleb S. KEITHLEY
cbc4b142e5 nfs-ganesha 2.4.3 GA 2017-02-08 07:35:29 -05:00
Kaleb S. KEITHLEY
1b1ba590c6 nfs-ganesha 2.4.3 GA 2017-02-08 05:56:56 -05:00
Kaleb S. KEITHLEY
094556fcd7 nfs-ganesha 2.4.3 GA 2017-02-07 17:13:24 -05:00
Kaleb S. KEITHLEY
678423fa91 delete old patch file 2017-01-27 04:16:10 -05:00
Kaleb S. KEITHLEY
4a1eb56133 nfs-ganesha 2.4.2 GA 2017-01-23 20:20:55 -05:00
Kaleb S. KEITHLEY
e33d052261 python2 (vs python3) cleanup and delete obsolete patches 2017-01-18 13:26:06 -05:00
Kaleb S. KEITHLEY
1efc584c8f nfs-ganesha 2.4.1 w/ FSAL_RGW 2016-12-23 07:25:07 -05:00
Kaleb S. KEITHLEY
087f4be955 nfs-ganesha 2.4.1 GA 2016-10-31 09:35:03 -04:00
Kaleb S. KEITHLEY
b5dcaa6095 rebuild with libntirpc-1.4.3 2016-10-26 10:01:54 -04:00
Kaleb S. KEITHLEY
8677659365 nfs-ganesha 2.4.0 GA 2016-09-22 15:44:43 -04:00
Kaleb S. KEITHLEY
f03eb79e98 2.4-rc6 2016-09-21 07:48:51 -04:00
Kaleb S. KEITHLEY
6102d56037 nfs-ganesha-2.4 RC5 2016-09-16 01:25:54 -04:00
Kaleb S. KEITHLEY
8d5e465b9e 2.4-rc4 2016-09-11 10:56:46 -04:00
Kaleb S. KEITHLEY
8a9c7f9d80 2.4-rc3 2016-09-07 14:19:30 -04:00
Kaleb S. KEITHLEY
aad12c39e0 2.4-rc2 2016-09-06 09:48:40 -04:00
Kaleb S. KEITHLEY
1271f67f1e 2.4-rc1 2016-09-01 14:01:11 -04:00
Kaleb S. KEITHLEY
fa3f3eea69 2.4-rc1 2016-08-29 12:34:28 -04:00
Kaleb S. KEITHLEY
afb472918f 2.4-dev-29, jemalloc off by default (conflicts with glusterfs-api) 2016-08-16 07:50:23 -04:00
Kaleb S. KEITHLEY
a077e1d17e 2.4-dev-29, jemalloc off by default (conflicts with glusterfs-api) 2016-08-16 07:49:52 -04:00
Kaleb S. KEITHLEY
4afaf468c3 2.4-dev-29 2016-08-16 07:36:10 -04:00
Kaleb S. KEITHLEY
9a9c3b32a6 2.4-dev-29 2016-08-16 07:22:00 -04:00
Kaleb S. KEITHLEY
979f9e5e40 2.4-dev-29 2016-08-15 14:14:08 -04:00
Kaleb S. KEITHLEY
0b3779ea1e 2.4-dev-29 2016-08-15 13:58:11 -04:00
Kaleb S. KEITHLEY
d66e9549ed glusterfs-api-devel >= 3.8.0 2016-08-09 10:08:15 -04:00
Kaleb S. KEITHLEY
7e0751d7ab nfs-ganesha-2.4-dev-27 2016-08-01 13:41:23 -04:00
Kaleb S. KEITHLEY
b38b92a2d1 2.4-dev-26 2016-07-25 08:13:20 -04:00
Kaleb S. KEITHLEY
39fbbf3114 2.4-dev-25 (revised 32-bit) 2016-07-20 13:18:39 -04:00
Kaleb S. KEITHLEY
b10a9fccdc Merge remote-tracking branch 'origin/master' into f24 2016-07-19 11:56:12 -04:00
Kaleb S. KEITHLEY
94a2154831 Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/nfs-ganesha 2016-07-19 11:33:13 -04:00
Kaleb S. KEITHLEY
87299190b8 2.4-dev-25 2016-07-19 11:32:29 -04:00
Kaleb S. KEITHLEY
48252ca694 2.4-dev-25 2016-07-19 09:23:12 -04:00
Kaleb S. KEITHLEY
6a8b398cbd 2.4-dev-25 2016-07-19 09:06:59 -04:00
Fedora Release Engineering
cf1009b10e - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages 2016-07-19 08:02:27 +00:00
Kaleb S KEITHLEY
56672bbe5e Merge remote-tracking branch 'origin/master' into f24 2016-07-05 08:27:10 -04:00
Kaleb S KEITHLEY
b22c558234 2.4-dev-23 2016-07-05 07:48:53 -04:00
Kaleb S KEITHLEY
d0472e5551 Merge remote-tracking branch 'origin/master' into f24 2016-06-24 13:26:58 -04:00
Kaleb S KEITHLEY
edb8a2f067 2.4-dev-21 w/ FSAL_RGW 2016-06-24 13:19:30 -04:00
Kaleb S KEITHLEY
5a0dcbcc37 Merge branch 'master' of ssh://pkgs.fedoraproject.org/nfs-ganesha 2016-06-20 12:58:45 -04:00
Kaleb S KEITHLEY
c1c6f9f6ed 2.4-dev-21 2016-06-20 12:56:28 -04:00
Kaleb S KEITHLEY
358c9fcdeb Merge remote-tracking branch 'origin/master' into f24 2016-06-20 12:37:38 -04:00
Kaleb S KEITHLEY
adb988de7c 2.4-dev-21 2016-06-20 11:17:07 -04:00
Kaleb S KEITHLEY
6f59480bc3 Merge remote-tracking branch 'origin/master' into f24 2016-05-30 09:12:12 -04:00
Kaleb S KEITHLEY
ee3c33d435 2.4-dev-19 2016-05-30 09:06:54 -04:00
Kaleb S KEITHLEY
93d70cc0a8 2.4-dev-17 2016-05-10 10:39:33 -04:00
Kaleb S KEITHLEY
f2cd5cb1f2 2.4-dev-17 2016-05-10 07:55:18 -04:00
Kaleb S KEITHLEY
9aed528e43 2.4-dev-14 2016-04-08 09:07:46 -04:00
Kaleb S KEITHLEY
f0c06b76b1 2.4-dev-14 2016-04-08 09:07:02 -04:00
Kaleb S KEITHLEY
36130fd1b0 2.4-dev-14 2016-04-08 08:52:46 -04:00
Kaleb S KEITHLEY
f4828a9e36 update patch for 32-bit 2016-03-31 10:06:58 -04:00
Kaleb S KEITHLEY
b3a4f82167 2.4-dev-12 2016-03-31 09:36:24 -04:00
Kaleb S KEITHLEY
cd40e4bb53 2.4-dev-10 2016-02-29 21:18:28 -05:00
Kaleb S KEITHLEY
2bad9cc406 2.4-dev-7 2016-02-06 04:25:13 -05:00
Kaleb S KEITHLEY
fc2cc6affa 2.4-dev-7 2016-02-06 01:43:45 -05:00
Kaleb S KEITHLEY
666c3cfa34 2.4-dev-7 2016-02-05 04:22:34 -05:00
Fedora Release Engineering
93eaadae64 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 09:19:33 +00:00
Kaleb S KEITHLEY
e6e9eba5e4 Requires: rpcbind or portmap 2015-11-17 08:58:54 -05:00
28 changed files with 1137 additions and 2285 deletions

View File

@ -0,0 +1,16 @@
--- nfs-ganesha-3.5/src/config_samples/logrotate_ganesha.orig 2021-06-11 11:05:49.699522427 -0400
+++ nfs-ganesha-3.5/src/config_samples/logrotate_ganesha 2021-06-11 11:06:18.362010100 -0400
@@ -1,4 +1,5 @@
/var/log/ganesha/ganesha.log {
+ su ganesha ganesha
weekly
rotate 52
copytruncate
--- nfs-ganesha-3.5/src/config_samples/logrotate_fsal_gluster.orig 2021-06-11 11:05:59.857340860 -0400
+++ nfs-ganesha-3.5/src/config_samples/logrotate_fsal_gluster 2021-06-11 11:06:22.785931021 -0400
@@ -1,4 +1,5 @@
/var/log/ganesha/ganesha-gfapi.log {
+ su ganesha ganesha
weekly
rotate 52
copytruncate

78
0002-CMakeLists.txt.patch Normal file
View File

@ -0,0 +1,78 @@
--- nfs-ganesha-4-rc3/src/CMakeLists.txt.orig 2021-11-08 18:24:19.024041776 -0500
+++ nfs-ganesha-4-rc3/src/CMakeLists.txt 2021-11-09 13:54:02.553226811 -0500
@@ -558,11 +558,11 @@
gopt_test(USE_ADMIN_TOOLS)
if (USE_ADMIN_TOOLS)
- find_package (Python COMPONENTS Interpreter Development)
- if (NOT Python_Interpreter_FOUND)
+ find_package(PythonInterp ${USE_ADMIN_TOOLS_REQUIRED})
+ if (NOT PYTHONINTERP_FOUND)
message(WARNING "Cannot find python. Disablin admin tools")
set(USE_ADMIN_TOOLS OFF)
- endif (NOT Python_Interpreter_FOUND)
+ endif (NOT PYTHONINTERP_FOUND)
endif (USE_ADMIN_TOOLS)
gopt_test(USE_GUI_ADMIN_TOOLS)
--- nfs-ganesha-4-rc4/src/scripts/ganeshactl/CMakeLists.txt.orig 2021-11-17 09:22:20.860134361 -0500
+++ nfs-ganesha-4-rc4/src/scripts/ganeshactl/CMakeLists.txt 2021-11-17 09:41:47.651949504 -0500
@@ -44,7 +44,7 @@
Ganesha/QtUI/ui_log_dialog.ui
)
-if(Python_FOUND)
+if(PYTHONINTERP_FOUND)
set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
set(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/ganeshactl_timestamp")
@@ -118,7 +118,7 @@
add_custom_command(
OUTPUT ${OUTPUT}
- COMMAND ${Python_EXECUTABLE} "${SETUP_PY}" build
+ COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}" build
COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
DEPENDS ${GANESHA_SRCS} ${UI_PY_FILES} ${SCRIPTS}
)
@@ -127,9 +127,9 @@
install(
CODE
- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
)
-endif(Python_FOUND)
+endif(PYTHONINTERP_FOUND)
# Man page
set(man8_file ganesha_conf.man)
--- nfs-ganesha-4-rc4/src/scripts/gpfs-epoch/CMakeLists.txt.orig 2021-11-17 09:22:55.938555754 -0500
+++ nfs-ganesha-4-rc4/src/scripts/gpfs-epoch/CMakeLists.txt 2021-11-17 09:41:32.836208727 -0500
@@ -1,6 +1,6 @@
if(USE_FSAL_GPFS)
- if(Python_FOUND)
+ if(PYTHONINTERP_FOUND)
set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
set(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/gpfs_epoch_timestamp")
@@ -38,7 +38,7 @@
add_custom_command(
OUTPUT ${OUTPUT}
COMMAND ${CMAKE_COMMAND} -E touch __init__.py
- COMMAND ${Python_EXECUTABLE} "${SETUP_PY}" build
+ COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}" build
COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
DEPENDS ${GPFS_EPOCH_SRCS} ${SCRIPTS}
)
@@ -47,7 +47,7 @@
install(
CODE
- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
)
- endif(Python_FOUND)
+ endif(PYTHONINTERP_FOUND)
endif(USE_FSAL_GPFS)

View File

@ -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 <sys/syscall.h>
#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 '..' */

View File

@ -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);

View File

@ -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;

View File

@ -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

View File

@ -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 ##################
#*

View File

@ -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);

View File

@ -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;

View File

@ -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)

View File

@ -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

View File

@ -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;
}
}

View File

@ -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;

View File

@ -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

View File

@ -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,

View File

@ -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 ###############

View File

@ -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)

View File

@ -1,11 +0,0 @@
--- nfs-ganesha-2.3.2/src/include/nfsv41.h.org 2016-05-03 18:10:18.701170555 +0530
+++ nfs-ganesha-2.3.2/src/include/nfsv41.h 2016-05-03 18:10:35.175228434 +0530
@@ -3646,7 +3646,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;

View File

@ -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, "<SUMMARY>\n");
- fprintf(output, " <BLOCK_COUNT> %ld </BLOCKCOUNT>\n",
+ fprintf(output, " <BLOCK_COUNT> %zd </BLOCKCOUNT>\n",
glist_length(&tree->root.u.nterm.sub_nodes));
fprintf(output, " <CONFIGURATION_FILES>\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(&current_grace, current_time);
+ atomic_store_time_t(&current_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 "(<length>:". 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 "(<length>:". 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;

View File

@ -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, "<SUMMARY>\n");
- fprintf(output, " <BLOCK_COUNT> %ld </BLOCKCOUNT>\n",
+ fprintf(output, " <BLOCK_COUNT> %zd </BLOCKCOUNT>\n",
glist_length(&tree->root.u.nterm.sub_nodes));
fprintf(output, " <CONFIGURATION_FILES>\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(&current_grace, current_time);
+ atomic_store_time_t(&current_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 "(<length>:". 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 "(<length>:". 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;

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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 "." !!

View File

@ -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

View File

@ -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)

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
967210e9818c327eda800ae0c0a55514 nfs-ganesha-2.3.3.tar.gz SHA512 (nfs-ganesha-4.0.tar.gz) = c6ec8146159500f03a4a8b1beb0e03ce79da33c67e8c077d1c7aea8be67d77690839bb7e10c88a9b8a3a8a9cca00ca10851f34f71c6f047956b24e7b7d9a7770