71 lines
2.1 KiB
Diff
71 lines
2.1 KiB
Diff
|
--- 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)
|