X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fflocks_test.c;h=be5e38f1da3cedbb75256fdf25588f7bcd961b71;hb=46192db9ae1a3370365e868764817407289d0fd5;hp=a4a00a862656c0f8f2b4ffecc3ce0a4cd099fbdf;hpb=381604c5c45c7f7394185f434bb8ad1dd4ed88af;p=fs%2Flustre-release.git

diff --git a/lustre/tests/flocks_test.c b/lustre/tests/flocks_test.c
index a4a00a8..be5e38f 100644
--- a/lustre/tests/flocks_test.c
+++ b/lustre/tests/flocks_test.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -371,7 +371,8 @@ int t4(int argc, char *argv[])
 	};
 
 	int fd, fd2;
-	int pid;
+	pid_t child_pid;
+	int child_status;
 	int rc = EXIT_SUCCESS;
 
 	if (argc != 4) {
@@ -389,18 +390,19 @@ int t4(int argc, char *argv[])
 		goto out;
 	}
 
-	pid = fork();
-	if (pid == -1) {
+	child_pid = fork();
+	if (child_pid < 0) {
 		perror("fork");
 		rc = EXIT_FAILURE;
 		goto out;
 	}
 
-	if (pid == 0) {
+	if (child_pid == 0) {
 		printf("%d: get lock1\n", getpid());
 		fflush(stdout);
 		if (t_fcntl(fd, F_SETLKW, &lock) < 0) {
-			perror("first flock failed");
+			fprintf(stderr, "%d: cannot get lock1: %s\n",
+				getpid(), strerror(errno));
 			rc = EXIT_FAILURE;
 			goto out_child;
 		}
@@ -409,8 +411,14 @@ int t4(int argc, char *argv[])
 		printf("%d: get lock2\n", getpid());
 		fflush(stdout);
 		if (t_fcntl(fd2, F_SETLKW, &lock) < 0) {
-			perror("first flock failed");
-			rc = EXIT_FAILURE;
+			fprintf(stderr, "%d: cannot get lock2: %s\n",
+				getpid(), strerror(errno));
+
+			if (errno == EDEADLK)
+				rc = EXIT_SUCCESS;
+			else
+				rc = EXIT_FAILURE;
+
 			goto out_child;
 		}
 		printf("%d: done\n", getpid());
@@ -421,7 +429,8 @@ out_child:
 		printf("%d: get lock2\n", getpid());
 		fflush(stdout);
 		if (t_fcntl(fd2, F_SETLKW, &lock) < 0) {
-			perror("first flock failed");
+			fprintf(stderr, "%d: cannot get lock2: %s\n",
+				getpid(), strerror(errno));
 			rc = EXIT_FAILURE;
 			goto out;
 		}
@@ -430,13 +439,43 @@ out_child:
 		printf("%d: get lock1\n", getpid());
 		fflush(stdout);
 		if (t_fcntl(fd, F_SETLKW, &lock) < 0) {
-			perror("first flock failed");
-			rc = EXIT_FAILURE;
-			goto out;
+			fprintf(stderr, "%d: cannot get lock1: %s\n",
+				getpid(), strerror(errno));
+
+			if (errno != EDEADLK) {
+				rc = EXIT_FAILURE;
+				goto out;
+			}
 		}
 		printf("%d: done\n", getpid());
 	}
 
+	sleep(1);
+
+	if (close(fd) < 0) {
+		fprintf(stderr, "%d: error closing file1: %s\n",
+			getpid(), strerror(errno));
+		rc = EXIT_FAILURE;
+	}
+
+	if (close(fd2) < 0) {
+		fprintf(stderr, "%d: error closing file2: %s\n",
+			getpid(), strerror(errno));
+		rc = EXIT_FAILURE;
+	}
+
+	if (waitpid(child_pid, &child_status, 0) < 0) {
+		fprintf(stderr, "%d: cannot get termination status of %d: %s\n",
+			getpid(), child_pid, strerror(errno));
+		rc = EXIT_FAILURE;
+	} else if (!WIFEXITED(child_status)) {
+		fprintf(stderr, "%d: child %d terminated with status %d\n",
+			getpid(), child_pid, child_status);
+		rc = EXIT_FAILURE;
+	} else {
+		rc = WEXITSTATUS(child_status);
+	}
+
 out:
 	printf("%d: exit rc=%d\n", getpid(), rc);
 	return rc;