[Ocfs2-tools-commits] mfasheh commits r623 - trunk/libo2dlm

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2005-01-28 16:58:02 -0600 (Fri, 28 Jan 2005)
New Revision: 623

Modified:
   trunk/libo2dlm/o2dlm.c
   trunk/libo2dlm/o2dlm_err.et.in
Log:
* return a specific error code if a trylock attempt fails.



Modified: trunk/libo2dlm/o2dlm.c
===================================================================
--- trunk/libo2dlm/o2dlm.c	2005-01-28 22:57:32 UTC (rev 622)
+++ trunk/libo2dlm/o2dlm.c	2005-01-28 22:58:02 UTC (rev 623)
@@ -370,6 +370,9 @@
 	if (fd < 0) {
 		free(path);
 		free(lockres);
+		if ((lockflags & O2DLM_TRYLOCK) &&
+		    (errno == ETXTBSY))
+			return O2DLM_ET_TRYLOCK_FAILED;
 		return O2DLM_ET_LOCKING;
 	}
 

Modified: trunk/libo2dlm/o2dlm_err.et.in
===================================================================
--- trunk/libo2dlm/o2dlm_err.et.in	2005-01-28 22:57:32 UTC (rev 622)
+++ trunk/libo2dlm/o2dlm_err.et.in	2005-01-28 22:58:02 UTC (rev 623)
@@ -99,4 +99,7 @@
 ec	O2DLM_ET_INVALID_ARGS,
 	"Invalid arguments passed to function"
 
+ec	O2DLM_ET_TRYLOCK_FAILED,
+	"Trylock failed"
+
 	end