summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-06-14 13:22:27 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-15 03:28:15 +0200
commitec111bd050506e22b43bf8178919086a91846281 (patch)
treea05ec04483844518e683c2c2eaf4caaa2b6a86ef
parent7738b574c2f0bd15aca2133abd7aeeb73d6356c3 (diff)
downloadsamba-ec111bd050506e22b43bf8178919086a91846281.tar.gz
samba-ec111bd050506e22b43bf8178919086a91846281.tar.bz2
samba-ec111bd050506e22b43bf8178919086a91846281.zip
s3:smbd: change smb2_lock.c to use fsp_fnum_dbg() for fsp->fnum logging.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/smbd/smb2_lock.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 03c7f6c7e2..68ad9e6e37 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -234,8 +234,8 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
}
state->smb1req = smb1req;
- DEBUG(10,("smbd_smb2_lock_send: %s - fnum[%d]\n",
- fsp_str_dbg(fsp), fsp->fnum));
+ DEBUG(10,("smbd_smb2_lock_send: %s - %s\n",
+ fsp_str_dbg(fsp), fsp_fnum_dbg(fsp)));
locks = talloc_array(state, struct smbd_lock_element, in_lock_count);
if (locks == NULL) {
@@ -748,9 +748,9 @@ static void reprocess_blocked_smb2_lock(struct smbd_smb2_request *smb2req,
*/
DEBUG(3,("reprocess_blocked_smb2_lock SUCCESS file = %s, "
- "fnum=%d num_locks=%d\n",
+ "%s, num_locks=%d\n",
fsp_str_dbg(fsp),
- fsp->fnum,
+ fsp_fnum_dbg(fsp),
(int)state->lock_count));
tevent_req_done(smb2req->subreq);
@@ -785,11 +785,11 @@ static void reprocess_blocked_smb2_lock(struct smbd_smb2_request *smb2req,
*/
DEBUG(10,("reprocess_blocked_smb2_lock: only got %d locks of %d needed "
- "for file %s, fnum = %d. Still waiting....\n",
+ "for file %s, %s. Still waiting....\n",
(int)blr->lock_num,
(int)state->lock_count,
fsp_str_dbg(fsp),
- (int)fsp->fnum));
+ fsp_fnum_dbg(fsp)));
return;