summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-05-07 07:25:13 -0700
committerJeremy Allison <jra@samba.org>2010-05-07 07:25:13 -0700
commit5b7163a23d92e0a0b00939218edfd685814d7881 (patch)
treec1745812b4cb97c27d61a7fe50fe56fa92ad5429
parent31b12622cf87dc6f7263550120973b6c56e17ba4 (diff)
downloadsamba-5b7163a23d92e0a0b00939218edfd685814d7881.tar.gz
samba-5b7163a23d92e0a0b00939218edfd685814d7881.tar.bz2
samba-5b7163a23d92e0a0b00939218edfd685814d7881.zip
Only MULTIPLE-UNLOCK test left to fix !
Jeremy.
-rw-r--r--source3/smbd/smb2_lock.c2
-rw-r--r--source3/smbd/smb2_read.c2
-rw-r--r--source3/smbd/smb2_write.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 8ea36be8ed..ceeba86138 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -341,7 +341,7 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
return tevent_req_post(req, ev);
}
- locks[i].smblctx = in_smbpid;
+ locks[i].smblctx = in_file_id_volatile;
locks[i].offset = in_locks[i].offset;
locks[i].count = in_locks[i].length;
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 2f36804bf6..7a92cdf920 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -261,7 +261,7 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
}
init_strict_lock_struct(fsp,
- in_smbpid,
+ in_file_id_volatile,
in_offset,
in_length,
READ_LOCK,
diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index b8e7a9c816..7813836e65 100644
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -254,7 +254,7 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
}
init_strict_lock_struct(fsp,
- in_smbpid,
+ in_file_id_volatile,
in_offset,
in_data.length,
WRITE_LOCK,