sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

r17896: Reformatting. I did not want to do it anymore, but these ones looked just

Browse Source 
silly :-)

Volker
(This used to be commit 8b6f5937db4b18db711dd0c4f1ae904087249000)
This commit is contained in:
Volker Lendecke 2006-08-28 18:25:55 +00:00 committed by Gerald (Jerry) Carter
parent c52b3fb89f
commit 49a08c7c5a
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source3/smbd/oplock_linux.c
View File

@ -89,7 +89,8 @@ static void set_capability(unsigned capability)
header.pid = 0; header.pid = 0;
if (capget(&header, &data) == -1) { if (capget(&header, &data) == -1) {
DEBUG(3,("Unable to get kernel capabilities (%s)\n", strerror(errno))); DEBUG(3,("Unable to get kernel capabilities (%s)\n",
strerror(errno)));
return; return;
} }
@ -156,15 +157,18 @@ static files_struct *linux_oplock_receive_message(fd_set *fds)
static BOOL linux_set_kernel_oplock(files_struct *fsp, int oplock_type) static BOOL linux_set_kernel_oplock(files_struct *fsp, int oplock_type)
{ {
if (linux_setlease(fsp->fh->fd, F_WRLCK) == -1) { if (linux_setlease(fsp->fh->fd, F_WRLCK) == -1) {
DEBUG(3,("linux_set_kernel_oplock: Refused oplock on file %s, fd = %d, dev = %x, \ DEBUG(3,("linux_set_kernel_oplock: Refused oplock on file %s, "
inode = %.0f. (%s)\n", "fd = %d, dev = %x, inode = %.0f. (%s)\n",
fsp->fsp_name, fsp->fh->fd, fsp->fsp_name, fsp->fh->fd,
(unsigned int)fsp->dev, (double)fsp->inode, strerror(errno))); (unsigned int)fsp->dev, (double)fsp->inode,
strerror(errno)));
return False; return False;
} }
DEBUG(3,("linux_set_kernel_oplock: got kernel oplock on file %s, dev = %x, inode = %.0f, file_id = %lu\n", DEBUG(3,("linux_set_kernel_oplock: got kernel oplock on file %s, "
fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, fsp->fh->file_id)); "dev = %x, inode = %.0f, file_id = %lu\n",
fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode,
fsp->fh->file_id));
return True; return True;
} }
@ -181,8 +185,9 @@ static void linux_release_kernel_oplock(files_struct *fsp)
* oplock state of this file. * oplock state of this file.
*/ */
int state = fcntl(fsp->fh->fd, F_GETLEASE, 0); 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 \ dbgtext("linux_release_kernel_oplock: file %s, dev = %x, "
oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev, "inode = %.0f file_id = %lu has kernel oplock state "
"of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev,
(double)fsp->inode, fsp->fh->file_id, state ); (double)fsp->inode, fsp->fh->file_id, state );
} }
@ -191,10 +196,12 @@ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev,
*/ */
if (linux_setlease(fsp->fh->fd, F_UNLCK) == -1) { if (linux_setlease(fsp->fh->fd, F_UNLCK) == -1) {
if (DEBUGLVL(0)) { if (DEBUGLVL(0)) {
dbgtext("linux_release_kernel_oplock: Error when removing kernel oplock on file " ); dbgtext("linux_release_kernel_oplock: Error when "
dbgtext("%s, dev = %x, inode = %.0f, file_id = %lu. Error was %s\n", "removing kernel oplock on file " );
fsp->fsp_name, (unsigned int)fsp->dev, dbgtext("%s, dev = %x, inode = %.0f, file_id = %lu. "
(double)fsp->inode, fsp->fh->file_id, strerror(errno) ); "Error was %s\n", fsp->fsp_name,
(unsigned int)fsp->dev, (double)fsp->inode,
fsp->fh->file_id, strerror(errno) );
} }
} }
} }