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

2.4-rc3

Browse Source
This commit is contained in:
Kaleb S. KEITHLEY 2016-09-07 14:19:30 -04:00
parent aad12c39e0
commit 8a9c7f9d80
3 changed files with 79 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
nfs-ganesha-2.4rc3-FSAL_RGW.handle.patch Normal file
View File

@ -0,0 +1,70 @@
--- nfs-ganesha-2.4-rc3/src/FSAL/FSAL_RGW/handle.c.orig 2016-09-07 13:45:17.387742345 -0400
+++ nfs-ganesha-2.4-rc3/src/FSAL/FSAL_RGW/handle.c 2016-09-07 14:09:26.241742345 -0400
@@ -238,7 +238,7 @@
RGW_SETATTR_UID | RGW_SETATTR_GID | RGW_SETATTR_MODE;
rc = rgw_create(export->rgw_fs, dir->rgw_fh, name, &st, create_mask,
- &rgw_fh, 0 /* posix flags */, RGW_CREATE_FLAG_NONE);
+ &rgw_fh, RGW_CREATE_FLAG_NONE);
if (rc < 0)
return rgw2fsal_error(rc);
@@ -771,8 +771,7 @@
PTHREAD_RWLOCK_wrlock(&obj_hdl->lock);
}
- rc = rgw_open(export->rgw_fs, handle->rgw_fh, posix_flags,
- (!state) ? RGW_OPEN_FLAG_V3 : RGW_OPEN_FLAG_NONE);
+ rc = rgw_open(export->rgw_fs, handle->rgw_fh, RGW_OPEN_FLAG_NONE);
if (rc < 0) {
if (!state) {
@@ -922,7 +921,7 @@
RGW_SETATTR_UID | RGW_SETATTR_GID | RGW_SETATTR_MODE;
rc = rgw_create(export->rgw_fs, handle->rgw_fh, name, &st, create_mask,
- &rgw_fh, posix_flags, RGW_CREATE_FLAG_NONE);
+ &rgw_fh, RGW_CREATE_FLAG_NONE);
if (rc < 0) {
LogFullDebug(COMPONENT_FSAL,
"Create %s failed with %s",
@@ -938,8 +937,7 @@
*/
posix_flags &= ~O_EXCL;
rc = rgw_create(export->rgw_fs, handle->rgw_fh, name, &st,
- create_mask, &rgw_fh, posix_flags,
- RGW_CREATE_FLAG_NONE);
+ create_mask, &rgw_fh, RGW_CREATE_FLAG_NONE);
if (rc < 0) {
LogFullDebug(COMPONENT_FSAL,
@@ -984,8 +982,7 @@
*new_obj = &obj->handle;
- rc = rgw_open(export->rgw_fs, rgw_fh, posix_flags,
- (!state) ? RGW_OPEN_FLAG_V3 : RGW_OPEN_FLAG_NONE);
+ rc = rgw_open(export->rgw_fs, rgw_fh, RGW_OPEN_FLAG_NONE);
if (rc < 0) {
goto fileerr;
@@ -1163,8 +1160,6 @@
* 9P does, V3 does not */
int rc = rgw_open(export->rgw_fs, handle->rgw_fh,
- posix_flags,
- (!state) ? RGW_OPEN_FLAG_V3 :
RGW_OPEN_FLAG_NONE);
if (rc < 0) {
@@ -1345,8 +1340,8 @@
handle);
LogFullDebug(COMPONENT_FSAL,
- "%s enter obj_hdl %p offset %"PRIx64" length %"PRIx64,
- __func__, obj_hdl, offset, len);
+ "%s enter obj_hdl %p offset %"PRIx64" length %zx",
+ __func__, obj_hdl, (uint64_t) offset, len);
rc = rgw_fsync(export->rgw_fs, handle->rgw_fh, RGW_FSYNC_FLAG_NONE);
if (rc < 0)

11
nfs-ganesha.spec
View File

@ -74,15 +74,16 @@ Requires: sles-release >= 12
Name: nfs-ganesha
Version: 2.4.0
%global dev rc2
%global dash_dev_version 2.4-rc2
Release: 0.18%{?dev:%{dev}}%{?dist}
%global dev rc3
%global dash_dev_version 2.4-rc3
Release: 0.19%{?dev:%{dev}}%{?dist}
Summary: NFS-Ganesha is a NFS Server running in user space
Group: Applications/System
License: LGPLv3+
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
Patch0: nfs-ganesha-2.4rc3-FSAL_RGW.handle.patch
BuildRequires: cmake
BuildRequires: bison
@ -302,6 +303,7 @@ be used with NFS-Ganesha to support Gluster
%prep
%setup -q -n %{name}-%{dash_dev_version}
rm -rf contrib/libzfswrapper
%patch0 -p1
%build
cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \
@ -546,6 +548,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
%endif
%changelog
* Wed Sep 7 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.19rc3
- 2.4-rc3
* Tue Sep 6 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.18rc2
- 2.4-rc2

2
sources
View File

@ -1 +1 @@
1fffa999bd71f9a8784223eb817664fd nfs-ganesha-2.4-rc2.tar.gz
78ce45e2a765d43a69aca63bb89bc3d0 nfs-ganesha-2.4-rc3.tar.gz