From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 8 Jun 2012 09:19:00 +0000 (+0200)
Subject: s3:smb2_read: pass fsp->fnum to init_strict_lock_struct()
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=0afc9592774b0084a0c5d3191e91570f124447fa;p=metze%2Fsamba%2Fwip.git

s3:smb2_read: pass fsp->fnum to init_strict_lock_struct()

fsp->fnum is the same as in_file_id_volatile.

When we start to support durable handles we should pass
in_file_id_persistent.

metze

Signed-off-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 21082e67cd8a..3c4b3e75bdd1 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -252,7 +252,7 @@ static int smb2_sendfile_send_data(struct smbd_smb2_read_state *state)
 	}
 
 	init_strict_lock_struct(fsp,
-				state->in_file_id_volatile,
+				fsp->fnum,
 				in_offset,
 				in_length,
 				READ_LOCK,
@@ -486,7 +486,7 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
 	/* Fallback to synchronous. */
 
 	init_strict_lock_struct(fsp,
-				in_file_id_volatile,
+				fsp->fnum,
 				in_offset,
 				in_length,
 				READ_LOCK,