--- nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_PSEUDO/handle.c.orig	2016-07-19 09:52:43.912803232 -0400
+++ nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_PSEUDO/handle.c	2016-07-19 09:54:56.309803232 -0400
@@ -315,7 +315,7 @@
 			    struct fsal_obj_handle **handle,
 			    struct attrlist *attrs_out)
 {
-	struct pseudo_fsal_obj_handle *myself, *hdl;
+	struct pseudo_fsal_obj_handle *myself, *hdl = NULL;
 	struct pseudo_fsal_obj_handle key[1];
 	struct avltree_node *node;
 	fsal_errors_t error = ERR_FSAL_NOENT;
--- nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_VFS/file.c.orig	2016-07-19 10:05:16.657803232 -0400
+++ nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_VFS/file.c	2016-07-19 10:19:24.847803232 -0400
@@ -435,7 +435,7 @@
 
 			if (retval == 0) {
 				LogFullDebug(COMPONENT_FSAL,
-					     "New size = %"PRIx64,
+					     "New size = %ld",
 					     stat.st_size);
 			} else {
 				if (errno == EBADF)
--- nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_GLUSTER/handle.c.orig	2016-07-19 10:49:48.109803232 -0400
+++ nfs-ganesha-2.4-dev-25/src/FSAL/FSAL_GLUSTER/handle.c	2016-07-19 10:54:46.075803232 -0400
@@ -2255,7 +2255,7 @@
 #endif
 
 	LogFullDebug(COMPONENT_FSAL,
-		     "Locking: op:%d type:%d start:%" PRIu64 " length:%lu ",
+		     "Locking: op(%d) type(%d) start(%" PRIu64 ") length(%" PRIu64 ")",
 		     lock_op, request_lock->lock_type, request_lock->lock_start,
 		     request_lock->lock_length);
 
@@ -2310,7 +2310,7 @@
 	 */
 	if (lock_args.l_len < 0) {
 		LogCrit(COMPONENT_FSAL,
-			"The requested lock length is out of range- lock_args.l_len(%ld), request_lock_length(%lu)",
+			"The requested lock length is out of range: lock_args.l_len(%" PRId64 "), request_lock_length(%" PRIu64 ")",
 			lock_args.l_len, request_lock->lock_length);
 		return fsalstat(ERR_FSAL_BAD_RANGE, 0);
 	}