summaryrefslogtreecommitdiff
path: root/source3/smbd/blocking.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-01-13 12:10:48 +0000
committerAndrew Tridgell <tridge@samba.org>2000-01-13 12:10:48 +0000
commit826446ddef1ef0f462c02932d11e3713f00497c7 (patch)
treedc50881b2f2d2e9c54e13c99bf7642f483a66990 /source3/smbd/blocking.c
parent6c2a1fdf360a8fcb100543fdb994860fe6268102 (diff)
downloadsamba-826446ddef1ef0f462c02932d11e3713f00497c7.tar.gz
samba-826446ddef1ef0f462c02932d11e3713f00497c7.tar.bz2
samba-826446ddef1ef0f462c02932d11e3713f00497c7.zip
changes to reflect the new syntax of the locking calls.
(This used to be commit 44117df2c908d473b3e1a1020b22af6d584809ef)
Diffstat (limited to 'source3/smbd/blocking.c')
-rw-r--r--source3/smbd/blocking.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 16882be2bb..5e7d4a0c87 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -274,7 +274,7 @@ static BOOL process_lockread(blocking_lock_record *blr)
numtoread = MIN(BUFFER_SIZE-outsize,numtoread);
data = smb_buf(outbuf) + 3;
- if(!do_lock( fsp, conn, numtoread, startpos, F_RDLCK, &eclass, &ecode)) {
+ if(!do_lock( fsp, conn, numtoread, startpos, READ_LOCK, &eclass, &ecode)) {
if((errno != EACCES) && (errno != EAGAIN)) {
/*
* We have other than a "can't get lock" POSIX
@@ -337,7 +337,7 @@ static BOOL process_lock(blocking_lock_record *blr)
offset = IVAL(inbuf,smb_vwv3);
errno = 0;
- if (!do_lock(fsp, conn, count, offset, F_WRLCK, &eclass, &ecode)) {
+ if (!do_lock(fsp, conn, count, offset, WRITE_LOCK, &eclass, &ecode)) {
if((errno != EACCES) && (errno != EAGAIN)) {
/*
@@ -409,7 +409,7 @@ static BOOL process_lockingX(blocking_lock_record *blr)
* request would never have been queued. JRA.
*/
errno = 0;
- if(!do_lock(fsp,conn,count,offset, ((locktype & 1) ? F_RDLCK : F_WRLCK),
+ if(!do_lock(fsp,conn,count,offset, ((locktype & 1) ? READ_LOCK : WRITE_LOCK),
&eclass, &ecode))
break;
}