Index: samba-4.2.0/source4/torture/smb2/lock.c
===================================================================
--- samba-4.2.0.orig/source4/torture/smb2/lock.c	2014-10-01 11:17:32.000000000 +0200
+++ samba-4.2.0/source4/torture/smb2/lock.c	2015-05-21 15:48:58.000000000 +0200
@@ -2891,11 +2891,9 @@
 		.length = 100,
 		.offset = 100,
 	};
-	lck = (struct smb2_lock) {
-		.in.locks = &el,
-		.in.lock_count	= 0x0001,
-		.in.file.handle	= h
-	};
+		lck.in.locks = ⪙
+		lck.in.lock_count	= 0x0001;
+		lck.in.file.handle	= h;
 
 	torture_comment(torture, "Testing Lock (ignored) Replay detection:\n");
 	lck.in.lock_sequence = 0x010 + 0x1;
@@ -2914,15 +2912,15 @@
 	torture_comment(torture, "Testing Set Resiliency:\n");
 	SIVAL(res_req, 0, 1000); /* timeout */
 	SIVAL(res_req, 4, 0);    /* reserved */
-	ioctl = (struct smb2_ioctl) {
-		.level = RAW_IOCTL_SMB2,
-		.in.file.handle = h,
-		.in.function = FSCTL_LMR_REQ_RESILIENCY,
-		.in.max_response_size = 0,
-		.in.flags = SMB2_IOCTL_FLAG_IS_FSCTL,
-		.in.out.data = res_req,
-		.in.out.length = sizeof(res_req)
-	};
+
+		ioctl.level = RAW_IOCTL_SMB2;
+		ioctl.in.file.handle = h;
+		ioctl.in.function = FSCTL_LMR_REQ_RESILIENCY;
+		ioctl.in.max_response_size = 0;
+		ioctl.in.flags = SMB2_IOCTL_FLAG_IS_FSCTL;
+		ioctl.in.out.data = res_req;
+		ioctl.in.out.length = sizeof(res_req);
+
 	status = smb2_ioctl(tree, torture, &ioctl);
 	CHECK_STATUS(status, NT_STATUS_OK);