svn commit: samba r6503 - in trunk/source: include lib locking smbd
herb at samba.org
herb at samba.org
Wed Apr 27 18:43:43 GMT 2005
Author: herb
Date: 2005-04-27 18:43:43 +0000 (Wed, 27 Apr 2005)
New Revision: 6503
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6503
Log:
pull change 6502 from samba_3_0 (add LOCKING debug class)
Modified:
trunk/source/include/debug.h
trunk/source/lib/debug.c
trunk/source/lib/util.c
trunk/source/locking/brlock.c
trunk/source/locking/locking.c
trunk/source/locking/posix.c
trunk/source/smbd/reply.c
Changeset:
Modified: trunk/source/include/debug.h
===================================================================
--- trunk/source/include/debug.h 2005-04-27 18:32:37 UTC (rev 6502)
+++ trunk/source/include/debug.h 2005-04-27 18:43:43 UTC (rev 6503)
@@ -95,6 +95,7 @@
#define DBGC_QUOTA 14
#define DBGC_ACLS 15
#define DBGC_PRINTERDB 16
+#define DBGC_LOCKING 17
/* So you can define DBGC_CLASS before including debug.h */
#ifndef DBGC_CLASS
Modified: trunk/source/lib/debug.c
===================================================================
--- trunk/source/lib/debug.c 2005-04-27 18:32:37 UTC (rev 6502)
+++ trunk/source/lib/debug.c 2005-04-27 18:43:43 UTC (rev 6503)
@@ -165,6 +165,7 @@
"quota", /* DBGC_QUOTA */
"acls", /* DBGC_ACLS */
"printerdb", /* DBGC_PRINTERDB */
+ "locking", /* DBGC_LOCKING */
NULL
};
Modified: trunk/source/lib/util.c
===================================================================
--- trunk/source/lib/util.c 2005-04-27 18:32:37 UTC (rev 6502)
+++ trunk/source/lib/util.c 2005-04-27 18:43:43 UTC (rev 6503)
@@ -1793,6 +1793,9 @@
SAFE_FREE(name_array);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/****************************************************************************
Simple routine to do POSIX file locking. Cruft in NFS and 64->32 bit mapping
is dealt with in posix.c
@@ -1843,6 +1846,9 @@
return(True);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
/*******************************************************************
Is the name specified one of my netbios names.
Returns true if it is equal, false otherwise.
Modified: trunk/source/locking/brlock.c
===================================================================
--- trunk/source/locking/brlock.c 2005-04-27 18:32:37 UTC (rev 6502)
+++ trunk/source/locking/brlock.c 2005-04-27 18:43:43 UTC (rev 6503)
@@ -27,6 +27,9 @@
#include "includes.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
#define ZERO_ZERO 0
/* This contains elements that differentiate locks. The smbpid is a
Modified: trunk/source/locking/locking.c
===================================================================
--- trunk/source/locking/locking.c 2005-04-27 18:32:37 UTC (rev 6502)
+++ trunk/source/locking/locking.c 2005-04-27 18:43:43 UTC (rev 6503)
@@ -37,6 +37,9 @@
#include "includes.h"
uint16 global_smbpid;
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/* the locking database handle */
static TDB_CONTEXT *tdb;
Modified: trunk/source/locking/posix.c
===================================================================
--- trunk/source/locking/posix.c 2005-04-27 18:32:37 UTC (rev 6502)
+++ trunk/source/locking/posix.c 2005-04-27 18:43:43 UTC (rev 6503)
@@ -24,6 +24,9 @@
#include "includes.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/*
* The POSIX locking database handle.
*/
Modified: trunk/source/smbd/reply.c
===================================================================
--- trunk/source/smbd/reply.c 2005-04-27 18:32:37 UTC (rev 6502)
+++ trunk/source/smbd/reply.c 2005-04-27 18:43:43 UTC (rev 6503)
@@ -2129,6 +2129,9 @@
return -1;
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/****************************************************************************
Reply to a lockread (core+ protocol).
****************************************************************************/
@@ -2222,6 +2225,9 @@
return(outsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
/****************************************************************************
Reply to a read.
****************************************************************************/
@@ -2610,6 +2616,9 @@
return(outsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/****************************************************************************
Reply to a writeunlock (core+).
****************************************************************************/
@@ -2674,6 +2683,9 @@
return outsize;
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
/****************************************************************************
Reply to a write.
****************************************************************************/
@@ -3121,6 +3133,9 @@
return(outsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/****************************************************************************
Reply to a lock.
****************************************************************************/
@@ -3201,6 +3216,9 @@
return(outsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
/****************************************************************************
Reply to a tdis.
****************************************************************************/
@@ -4652,6 +4670,9 @@
return(outsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_LOCKING
+
/****************************************************************************
Get a lock pid, dealing with large count requests.
****************************************************************************/
@@ -4989,6 +5010,9 @@
return chain_reply(inbuf,outbuf,length,bufsize);
}
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ALL
+
/****************************************************************************
Reply to a SMBreadbmpx (read block multiplex) request.
****************************************************************************/
More information about the samba-cvs
mailing list