diff options
| author | Jeremy Allison <jra@samba.org> | 2006-05-17 23:15:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:17:06 -0500 |
| commit | fd6fa1d4eaf61783df74ee2da50d331477f06998 (patch) | |
| tree | 7011e4b9a86d1fc652224fca2b1b9d3c0c804d88 /source/smbd/oplock_linux.c | |
| parent | f66b9701b5c6bb6302fa11889adab6902cbaf2e3 (diff) | |
| download | samba-fd6fa1d4eaf61783df74ee2da50d331477f06998.tar.gz samba-fd6fa1d4eaf61783df74ee2da50d331477f06998.tar.xz samba-fd6fa1d4eaf61783df74ee2da50d331477f06998.zip | |
r15668: DOS or FCB opens share one share mode entry from different
fsp pointers. Ensure we cope with this to pass Samba4
DENY tests (we used to pass these, there must have been
a regression with newer code). We now pass them.
Jeremy
Diffstat (limited to 'source/smbd/oplock_linux.c')
| -rw-r--r-- | source/smbd/oplock_linux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/smbd/oplock_linux.c b/source/smbd/oplock_linux.c index 9a5eb52e612..f186c13ebdd 100644 --- a/source/smbd/oplock_linux.c +++ b/source/smbd/oplock_linux.c @@ -164,7 +164,7 @@ inode = %.0f. (%s)\n", } DEBUG(3,("linux_set_kernel_oplock: got kernel oplock on file %s, dev = %x, inode = %.0f, file_id = %lu\n", - fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id)); + fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, fsp->fh->file_id)); return True; } @@ -183,7 +183,7 @@ static void linux_release_kernel_oplock(files_struct *fsp) int state = fcntl(fsp->fh->fd, F_GETLEASE, 0); dbgtext("linux_release_kernel_oplock: file %s, dev = %x, inode = %.0f file_id = %lu has kernel \ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev, - (double)fsp->inode, fsp->file_id, state ); + (double)fsp->inode, fsp->fh->file_id, state ); } /* @@ -194,7 +194,7 @@ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev, dbgtext("linux_release_kernel_oplock: Error when removing kernel oplock on file " ); dbgtext("%s, dev = %x, inode = %.0f, file_id = %lu. Error was %s\n", fsp->fsp_name, (unsigned int)fsp->dev, - (double)fsp->inode, fsp->file_id, strerror(errno) ); + (double)fsp->inode, fsp->fh->file_id, strerror(errno) ); } } } |