2016-03-31 13:36:24 +00:00
|
|
|
--- nfs-ganesha-2.4-dev-12/src/include/nfsv41.h.orig 2016-03-31 09:24:59.815760250 -0400
|
|
|
|
|
+++ nfs-ganesha-2.4-dev-12/src/include/nfsv41.h 2016-03-31 09:25:38.566760250 -0400
|
|
|
|
|
@@ -3775,7 +3775,7 @@
|
|
|
|
|
return false;
|
|
|
|
|
/* skip any further elements and lie on bitmap len */
|
|
|
|
|
for (i = mapsize; i < objp->bitmap4_len; i++) {
|
|
|
|
|
- u_int crud;
|
|
|
|
|
+ u_int crud = 0;
|
|
|
|
|
|
|
|
|
|
if (!inline_xdr_u_int32_t(xdrs, &crud))
|
|
|
|
|
return false;
|
2016-03-31 14:06:58 +00:00
|
|
|
--- nfs-ganesha-2.4-dev-12/src/FSAL/FSAL_VFS/file.c.orig 2016-03-31 10:02:07.605760250 -0400
|
|
|
|
|
+++ nfs-ganesha-2.4-dev-12/src/FSAL/FSAL_VFS/file.c 2016-03-31 10:04:38.076760250 -0400
|
|
|
|
|
@@ -1918,7 +1918,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
LogFullDebug(COMPONENT_FSAL,
|
|
|
|
|
- "Locking: op:%d type:%d start:%" PRIu64 " length:%lu ",
|
|
|
|
|
+ "Locking: op:%d type:%d start:%" PRIu64 " length:%" PRIu64 " ",
|
|
|
|
|
lock_op, request_lock->lock_type, request_lock->lock_start,
|
|
|
|
|
request_lock->lock_length);
|
|
|
|
|
|
|
|
|
|
@@ -1973,7 +1973,7 @@
|
|
|
|
|
*/
|
|
|
|
|
if (lock_args.l_len < 0) {
|
|
|
|
|
LogCrit(COMPONENT_FSAL,
|
|
|
|
|
- "The requested lock length is out of range- lock_args.l_len(%ld), request_lock_length(%lu)",
|
|
|
|
|
+ "The requested lock length is out of range- lock_args.l_len(%ld), request_lock_length(%" PRIu64 ")",
|
|
|
|
|
lock_args.l_len, request_lock->lock_length);
|
|
|
|
|
return fsalstat(ERR_FSAL_BAD_RANGE, 0);
|
|
|
|
|
}
|
