Attachment 11866 Details for Bug 11748 – Proposed patch

[patch] Proposed patch

0001-s4-torture-Compatibility-fix-for-xlc.patch (text/plain), 4.63 KB, created by Guillaume Xavier Taillon (mail address dead) on 2016-02-23 18:36:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Xavier Taillon (mail address dead)

Created: 2016-02-23 18:36:59 UTC

Size: 4.63 KB

patch

obsolete

>From 8984e38f795ac0e0a6ddf29178a1df087f267e60 Mon Sep 17 00:00:00 2001
>From: Guillaume Xavier Taillon <gtaillon@ca.ibm.com>
>Date: Tue, 23 Feb 2016 11:56:13 -0500
>Subject: [PATCH] s4:torture: Compatibility fix for xlc
>
>"../source3/locking/brlock.c", line 1034.32: 1506-196 (S) Initialization between types "unsigned long long" and "struct server_id" is not allowed.
>[...]
>
>There's a wierd designated initializer problem with xlc 13, this patches it.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11748
>Signed-off-by: Guillaume Xavier Taillon <gtaillon@ca.ibm.com>
>---
> source3/locking/brlock.c      |    2 +-
> source4/torture/smb2/lock.c   |    8 ++++----
> source4/torture/smb2/replay.c |   16 ++++++++--------
> 3 files changed, 13 insertions(+), 13 deletions(-)
>
>diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
>index e8c8d89..cfd136d 100644
>--- a/source3/locking/brlock.c
>+++ b/source3/locking/brlock.c
>@@ -1031,7 +1031,7 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx,
> 
> 	lock = (struct lock_struct) {
> 		.context.smblctx = smblctx,
>-		.context.pid = pid,
>+		.context = {.pid = pid},
> 		.context.tid = br_lck->fsp->conn->cnum,
> 		.start = start,
> 		.size = size,
>diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
>index 68e353d..006e2ef 100644
>--- a/source4/torture/smb2/lock.c
>+++ b/source4/torture/smb2/lock.c
>@@ -2889,12 +2889,12 @@ static bool test_replay(struct torture_context *torture,
> 	 */
> 	el = (struct smb2_lock_element) {
> 		.length = 100,
>-		.offset = 100,
>+		.offset =100,
> 	};
> 	lck = (struct smb2_lock) {
> 		.in.locks = &el,
>-		.in.lock_count	= 0x0001,
>-		.in.file.handle	= h
>+		.in.lock_count = 0x0001,
>+		.in.file = {.handle = h}
> 	};
> 
> 	torture_comment(torture, "Testing Lock (ignored) Replay detection:\n");
>@@ -2916,7 +2916,7 @@ static bool test_replay(struct torture_context *torture,
> 	SIVAL(res_req, 4, 0);    /* reserved */
> 	ioctl = (struct smb2_ioctl) {
> 		.level = RAW_IOCTL_SMB2,
>-		.in.file.handle = h,
>+		.in.file = {.handle = h},
> 		.in.function = FSCTL_LMR_REQ_RESILIENCY,
> 		.in.max_response_size = 0,
> 		.in.flags = SMB2_IOCTL_FLAG_IS_FSCTL,
>diff --git a/source4/torture/smb2/replay.c b/source4/torture/smb2/replay.c
>index e4f5b01..3b533e3 100644
>--- a/source4/torture/smb2/replay.c
>+++ b/source4/torture/smb2/replay.c
>@@ -210,14 +210,14 @@ static bool test_replay1(struct torture_context *tctx, struct smb2_tree *tree)
> 	CHECK_STATUS(status, NT_STATUS_OK);
> 
> 	f = (struct smb2_flush) {
>-		.in.file.handle = h
>+		.in.file = {.handle = h}
> 	};
> 	torture_comment(tctx, "Trying flush\n");
> 	status = smb2_flush(tree, &f);
> 	CHECK_STATUS(status, NT_STATUS_OK);
> 
> 	rd = (struct smb2_read) {
>-		.in.file.handle = h,
>+		.in.file = {.handle = h},
> 		.in.length = 10,
> 		.in.offset = 0,
> 		.in.min_count = 1
>@@ -236,7 +236,7 @@ static bool test_replay1(struct torture_context *tctx, struct smb2_tree *tree)
> 
> 	qfinfo = (union smb_fileinfo) {
> 		.generic.level = RAW_SFILEINFO_POSITION_INFORMATION,
>-		.generic.in.file.handle = h
>+		.generic.in.file = {.handle = h}
> 	};
> 	torture_comment(tctx, "Trying getinfo\n");
> 	status = smb2_getinfo_file(tree, tmp_ctx, &qfinfo);
>@@ -245,7 +245,7 @@ static bool test_replay1(struct torture_context *tctx, struct smb2_tree *tree)
> 
> 	ioctl = (union smb_ioctl) {
> 		.smb2.level = RAW_IOCTL_SMB2,
>-		.smb2.in.file.handle = h,
>+		.smb2.in.file = {.handle = h},
> 		.smb2.in.function = FSCTL_CREATE_OR_GET_OBJECT_ID,
> 		.smb2.in.max_response_size = 64,
> 		.smb2.in.flags = SMB2_IOCTL_FLAG_IS_FSCTL
>@@ -258,7 +258,7 @@ static bool test_replay1(struct torture_context *tctx, struct smb2_tree *tree)
> 		.in.locks = el,
> 		.in.lock_count = 0x0001,
> 		.in.lock_sequence = 0x00000000,
>-		.in.file.handle	= h
>+		.in.file = {.handle = h}
> 	};
> 	el[0].reserved		= 0x00000000;
> 	el[0].flags		= SMB2_LOCK_FLAG_EXCLUSIVE |
>@@ -665,7 +665,7 @@ static bool test_replay4(struct torture_context *tctx, struct smb2_tree *tree1)
> 	 * Perform a Read with incremented ChannelSequence
> 	 */
> 	rd = (struct smb2_read) {
>-		.in.file.handle = *h1,
>+		.in.file = {.handle = *h1},
> 		.in.length = sizeof(buf),
> 		.in.offset = 0
> 	};
>@@ -706,7 +706,7 @@ static bool test_replay4(struct torture_context *tctx, struct smb2_tree *tree1)
> 	 * Performing a Read with stale ChannelSequence is allowed
> 	 */
> 	rd = (struct smb2_read) {
>-		.in.file.handle = *h1,
>+		.in.file = {.handle = *h1},
> 		.in.length = ARRAY_SIZE(buf),
> 		.in.offset = 0
> 	};
>@@ -774,7 +774,7 @@ static bool test_replay4(struct torture_context *tctx, struct smb2_tree *tree1)
> 	 * Read back from File to verify what was written
> 	 */
> 	rd = (struct smb2_read) {
>-		.in.file.handle = *h1,
>+		.in.file = {.handle = *h1},
> 		.in.length = ARRAY_SIZE(buf),
> 		.in.offset = 0
> 	};
>-- 
>1.7.1
>

Actions: View

Attachments on bug 11748: 11866