diff options
| author | Jeremy Allison <jra@samba.org> | 1998-09-18 18:09:17 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-09-18 18:09:17 +0000 |
| commit | 31ebc956e5f17fef8411b5fef1a6529df072df2a (patch) | |
| tree | c4bf7df21b860cd1c7b2a8c7bdf7ea1b57f1bfdc /source3/smbd/open.c | |
| parent | 184db9266efcbcea13169f99002b32208dc2ec9b (diff) | |
| download | samba-31ebc956e5f17fef8411b5fef1a6529df072df2a.tar.gz samba-31ebc956e5f17fef8411b5fef1a6529df072df2a.tar.bz2 samba-31ebc956e5f17fef8411b5fef1a6529df072df2a.zip | |
Fixed problems with premature kernel oplock checkin code.
The ./configure & build now seem to work ok.
Jeremy.
(This used to be commit 7c1a5ed1c2a55543d3f3c8bbd38e6c9c35b80390)
Diffstat (limited to 'source3/smbd/open.c')
| -rw-r--r-- | source3/smbd/open.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index abbc0d6741..0d8fcddbe5 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -687,7 +687,7 @@ static int check_share_mode( share_mode_entry *share, int deny_mode, open a file with a share mode ****************************************************************************/ void open_file_shared(files_struct *fsp,connection_struct *conn,char *fname,int share_mode,int ofun, - mode_t mode,int *oplock_request, int *Access,int *action) + mode_t mode,int oplock_request, int *Access,int *action) { int flags=0; int flags2=0; @@ -922,7 +922,7 @@ dev = %x, inode = %.0f\n", old_shares[i].op_type, fname, (unsigned int)dev, (dou be extended to level II oplocks (multiple reader oplocks). */ - if((*oplock_request) && (num_share_modes == 0) && lp_oplocks(SNUM(conn)) && + if((oplock_request) && (num_share_modes == 0) && lp_oplocks(SNUM(conn)) && !IS_VETO_OPLOCK_PATH(conn,fname)) { #if defined(HAVE_KERNEL_OPLOCKS) @@ -941,15 +941,15 @@ dev = %x, inode = %.0f\n", old_shares[i].op_type, fname, (unsigned int)dev, (dou port = oplock_port; DEBUG(5,("open_file_shared: granted oplock (%x) on file %s, \ -dev = %x, inode = %.0f\n", *oplock_request, fname, (unsigned int)dev, (double)inode)); +dev = %x, inode = %.0f\n", oplock_request, fname, (unsigned int)dev, (double)inode)); } else { port = 0; - *oplock_request = 0; + oplock_request = 0; } - set_share_mode(token, fsp, port, *oplock_request); + set_share_mode(token, fsp, port, oplock_request); } if ((flags2&O_TRUNC) && file_existed) |