[Ocfs2-tools-commits] zab commits r1113 - in trunk: extras libocfs2/include

[svn-commits at oss.oracle.com]

Author: zab
Signed-off-by: mfasheh
Date: 2005-11-08 13:43:23 -0600 (Tue, 08 Nov 2005)
New Revision: 1113

Modified:
   trunk/extras/decode_lockres.c
   trunk/libocfs2/include/ocfs2_lockid.h
Log:
o teach -tools about the existance of the RW lock type

Signed-off-by: mfasheh


Modified: trunk/extras/decode_lockres.c
===================================================================
--- trunk/extras/decode_lockres.c	2005-11-07 03:50:48 UTC (rev 1112)
+++ trunk/extras/decode_lockres.c	2005-11-08 19:43:23 UTC (rev 1113)
@@ -36,6 +36,8 @@
 	OCFS2_TYPE_META = 0,
 	OCFS2_TYPE_DATA,
 	OCFS2_TYPE_SUPER,
+	OCFS2_TYPE_RENAME,
+	OCFS2_TYPE_RW,
 	OCFS2_NUM_LOCK_TYPES
 };
 
@@ -51,14 +53,18 @@
 static char ocfs2_lock_type_char[OCFS2_NUM_LOCK_TYPES] = {
 	[OCFS2_TYPE_META]  = 'M',
 	[OCFS2_TYPE_DATA]  = 'D',
-	[OCFS2_TYPE_SUPER] = 'S'
+	[OCFS2_TYPE_SUPER] = 'S',
+	[OCFS2_TYPE_RENAME] = 'R',
+	[OCFS2_TYPE_RW] = 'W',
 };
 /* End paste from kernel module */
 
 static char * ocfs2_lock_type_string[OCFS2_NUM_LOCK_TYPES] = {
 	[OCFS2_TYPE_META]  = "Metadata",
 	[OCFS2_TYPE_DATA]  = "Data",
-	[OCFS2_TYPE_SUPER] = "Superblock"
+	[OCFS2_TYPE_SUPER] = "Superblock",
+	[OCFS2_TYPE_RENAME] = "Rename",
+	[OCFS2_TYPE_RW] = "Write/Read",
 };
 
 static void usage(char *program)
@@ -77,6 +83,10 @@
 		t = OCFS2_TYPE_DATA;
 	else if (c == ocfs2_lock_type_char[OCFS2_TYPE_SUPER])
 		t = OCFS2_TYPE_SUPER;
+	else if (c == ocfs2_lock_type_char[OCFS2_TYPE_RENAME])
+		t = OCFS2_TYPE_RENAME;
+	else if (c == ocfs2_lock_type_char[OCFS2_TYPE_RW])
+		t = OCFS2_TYPE_RW;
 	else
 		return NULL;
 

Modified: trunk/libocfs2/include/ocfs2_lockid.h
===================================================================
--- trunk/libocfs2/include/ocfs2_lockid.h	2005-11-07 03:50:48 UTC (rev 1112)
+++ trunk/libocfs2/include/ocfs2_lockid.h	2005-11-08 19:43:23 UTC (rev 1113)
@@ -40,6 +40,7 @@
 	OCFS2_LOCK_TYPE_DATA,
 	OCFS2_LOCK_TYPE_SUPER,
 	OCFS2_LOCK_TYPE_RENAME,
+	OCFS2_LOCK_TYPE_RW,
 	OCFS2_NUM_LOCK_TYPES
 };
 
@@ -59,6 +60,9 @@
 		case OCFS2_LOCK_TYPE_RENAME:
 			c = 'R';
 			break;
+		case OCFS2_LOCK_TYPE_RW:
+			c = 'W';
+			break;
 		default:
 			c = '\0';
 	}