[Cluster-devel] cluster/dlm lib/libdlm.h man/dlm_query.3

[pcaulfield at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	pcaulfield at sourceware.org	2007-07-11 14:00:27

Modified files:
	dlm/lib        : libdlm.h 
	dlm/man        : dlm_query.3 

Log message:
	Fix typo (in .h file too!) that refers to nodes rather than locks on queues.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/libdlm.h.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.8&r2=1.8.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/man/dlm_query.3.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.2&r2=1.1.2.3

--- cluster/dlm/lib/libdlm.h	2004/11/08 14:06:08	1.8
+++ cluster/dlm/lib/libdlm.h	2007/07/11 14:00:26	1.8.2.1
@@ -101,9 +101,9 @@
 
 struct dlm_resinfo {
 	int rsi_length;
-	int rsi_grantcount;	/* No. of nodes on grant queue */
-	int rsi_convcount;	/* No. of nodes on convert queue */
-	int rsi_waitcount;	/* No. of nodes on wait queue */
+	int rsi_grantcount;	/* No. of locks on grant queue */
+	int rsi_convcount;	/* No. of locks on convert queue */
+	int rsi_waitcount;	/* No. of locks on wait queue */
 	int rsi_masternode;	/* Master for this resource */
 	char rsi_name[DLM_RESNAME_MAXLEN];	/* Resource name */
 	char rsi_valblk[DLM_LVB_LEN];	/* Master's LVB contents, if applicable
--- cluster/dlm/man/Attic/dlm_query.3	2007/07/11 13:22:29	1.1.2.2
+++ cluster/dlm/man/Attic/dlm_query.3	2007/07/11 14:00:27	1.1.2.3
@@ -70,9 +70,9 @@
 struct gdlm_resinfo
 {
   int	 rsi_length;
-  int  rsi_grantcount; /* No. of nodes on grant queue */
-  int  rsi_convcount;  /* No. of nodes on convert queue */
-  int  rsi_waitcount;  /* No. of nodes on wait queue */
+  int  rsi_grantcount; /* No. of locks on grant queue */
+  int  rsi_convcount;  /* No. of locks on convert queue */
+  int  rsi_waitcount;  /* No. of locks on wait queue */
   int  rsi_masternode; /* Master node for this resource */
   char rsi_name[DLM_RESNAME_MAXLEN]; /* Resource name */
   char rsi_valblk[DLM_LVB_LEN];    /* Master's LVB contents, if applicable */
@@ -139,7 +139,7 @@
 
 .SH EXAMPLE
 .nf
-This example display all other locks that are held against the resource.
+This example display all other locks that are held against the resource, up to a maximum of 100.
 
     #define MAX_QUERY_LOCKS 100
 
@@ -152,10 +152,9 @@
     qinfo.gqi_resinfo = &resinfo;
     qinfo.gqi_lockinfo = malloc(sizeof(struct dlm_lockinfo) * MAX_QUERY_LOCKS);
     qinfo.gqi_locksize = MAX_QUERY_LOCKS;
-    lksb.sb_lvbptr = (char *)&qinfo;
 
     status = dlm_query_wait(&tmplksb,
-		                DLM_QUERY_QUEUE_ALL | DLM_QUERY_LOCKS_ALL,
+                            DLM_QUERY_QUEUE_ALL | DLM_QUERY_LOCKS_ALL,
                        	    &qinfo);
     if (status)
         perror("Query failed");
@@ -167,6 +166,7 @@
     printf("lockinfo: convcount  = %d\n", qi->gqi_resinfo->rsi_convcount);
     printf("lockinfo: waitcount  = %d\n", qi->gqi_resinfo->rsi_waitcount);
     printf("lockinfo: masternode = %d\n", qi->gqi_resinfo->rsi_masternode);
+    printf("\n");
 
     /* Dump all the locks */
     for (i = 0; i < qi->gqi_lockcount; i++)