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
da10c49
..
c98313e
100644
(file)
--- a/
lustre/tests/openfile.c
+++ b/
lustre/tests/openfile.c
@@
-15,11
+15,7
@@
*
* 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
*/
@@
-49,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;
@@
-105,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;