Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-12296 llite: improve ll_dom_lock_cancel
[fs/lustre-release.git]
/
lustre
/
tests
/
openfile.c
diff --git
a/lustre/tests/openfile.c
b/lustre/tests/openfile.c
index
5a7e4d6
..
c98313e
100644
(file)
--- a/
lustre/tests/openfile.c
+++ b/
lustre/tests/openfile.c
@@
-1,6
+1,4
@@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-17,16
+15,12
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
/*
*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-51,8
+45,7
@@
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-#include <libcfs/libcfs.h>
-#include <lustre/lustre_user.h>
+#include <linux/lustre/lustre_user.h>
typedef struct flag_mapping {
const char *string;
typedef struct flag_mapping {
const char *string;
@@
-93,13
+86,13
@@
int main(int argc, char** argv)
int fd;
int flags = 0;
mode_t mode = 0644;
int fd;
int flags = 0;
mode_t mode = 0644;
- char
*
fname = NULL;
+ char
*
fname = NULL;
int mode_set = 0;
int flag_set = 0;
int c;
int save_errno = 0;
int print_usage = 0;
int mode_set = 0;
int flag_set = 0;
int c;
int save_errno = 0;
int print_usage = 0;
- char
*
cloned_flags = NULL;
+ char
*
cloned_flags = NULL;
if (argc == 1)
Usage_and_abort();
if (argc == 1)
Usage_and_abort();
@@
-107,16
+100,15
@@
int main(int argc, char** argv)
while ((c = getopt (argc, argv, "f:m:")) != -1) {
switch (c) {
case 'f': {
while ((c = getopt (argc, argv, "f:m:")) != -1) {
switch (c) {
case 'f': {
-
char *tmp;
+ char *tmp;
-
cloned_flags = (char *)malloc(strlen(optarg)+1
);
-
if (cloned_flags == NULL) {
-
fprintf(stderr, "Insufficient memory.\n");
-
save_errno = -1;
-
goto out;
-
}
+
cloned_flags = strdup(optarg
);
+ if (cloned_flags == NULL) {
+ fprintf(stderr, "Insufficient memory.\n");
+ save_errno = -1;
+ goto out;
+ }
- strncpy(cloned_flags, optarg, strlen(optarg)+1);
flags = atoi(cloned_flags);
if (flags > 0) {
flag_set = 1;
flags = atoi(cloned_flags);
if (flags > 0) {
flag_set = 1;
@@
-126,7
+118,7
@@
int main(int argc, char** argv)
break;
} else
flags = 0;
break;
} else
flags = 0;
-
+
for (tmp = strtok(cloned_flags, ":|"); tmp;
tmp = strtok(NULL, ":|")) {
int i = 0;
for (tmp = strtok(cloned_flags, ":|"); tmp;
tmp = strtok(NULL, ":|")) {
int i = 0;
@@
-203,12
+195,11
@@
int main(int argc, char** argv)
} else {
fprintf(stderr, "Error in opening file \"%s\"(flags=%s",
fname, cloned_flags);
} else {
fprintf(stderr, "Error in opening file \"%s\"(flags=%s",
fname, cloned_flags);
+ if (mode_set)
+ fprintf(stderr, ", mode=%o", mode);
+ fprintf(stderr, ") %d: %s\n", save_errno, strerror(save_errno));
}
}
- if (mode_set)
- fprintf(stderr, ", mode=%o", mode);
- fprintf(stderr, ") %d: %s\n", save_errno, strerror(save_errno));
-
out:
if (cloned_flags)
free(cloned_flags);
out:
if (cloned_flags)
free(cloned_flags);