Skip to content

Commit

Permalink
r17896: Reformatting. I did not want to do it anymore, but these ones…
Browse files Browse the repository at this point in the history
… looked just

silly :-)

Volker
(This used to be commit 8b6f593)
  • Loading branch information
vlendec authored and Gerald (Jerry) Carter committed Oct 10, 2007
1 parent c52b3fb commit 49a08c7
Showing 1 changed file with 19 additions and 12 deletions.
31 changes: 19 additions & 12 deletions source3/smbd/oplock_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ static void set_capability(unsigned capability)
header.pid = 0;

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;
}

Expand Down Expand Up @@ -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)
{
if (linux_setlease(fsp->fh->fd, F_WRLCK) == -1) {
DEBUG(3,("linux_set_kernel_oplock: Refused oplock on file %s, fd = %d, dev = %x, \
inode = %.0f. (%s)\n",
DEBUG(3,("linux_set_kernel_oplock: Refused oplock on file %s, "
"fd = %d, dev = %x, inode = %.0f. (%s)\n",
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;
}

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->fh->file_id));
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->fh->file_id));

return True;
}
Expand All @@ -181,8 +185,9 @@ static void linux_release_kernel_oplock(files_struct *fsp)
* oplock state of this file.
*/
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,
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->fh->file_id, state );
}

Expand All @@ -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 (DEBUGLVL(0)) {
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->fh->file_id, strerror(errno) );
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->fh->file_id, strerror(errno) );
}
}
}
Expand Down

0 comments on commit 49a08c7

Please sign in to comment.