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-1199 build: Simplify autotools version checks
[fs/lustre-release.git]
/
lustre
/
utils
/
llog_reader.c
diff --git
a/lustre/utils/llog_reader.c
b/lustre/utils/llog_reader.c
index
0e5735c
..
748be6c
100644
(file)
--- a/
lustre/utils/llog_reader.c
+++ b/
lustre/utils/llog_reader.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.
@@
-28,9
+26,8
@@
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
- */
-/*
- * Copyright (c) 2011 Whamcloud, Inc.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-175,7
+172,7
@@
int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
cur_rec->lrh_type, cur_rec->lrh_len);
} else {
printf("Bit %d of %d not set\n", idx, recs_num);
cur_rec->lrh_type, cur_rec->lrh_len);
} else {
printf("Bit %d of %d not set\n", idx, recs_num);
- cur_rec->lrh_
padding
= CANCELLED;
+ cur_rec->lrh_
id
= CANCELLED;
/* The header counts only set records */
i--;
}
/* The header counts only set records */
i--;
}
@@
-469,7
+466,7
@@
void print_records(struct llog_rec_hdr **recs, int rec_number)
lopt = le32_to_cpu(recs[i]->lrh_type);
lopt = le32_to_cpu(recs[i]->lrh_type);
- if (recs[i]->lrh_
padding
== CANCELLED)
+ if (recs[i]->lrh_
id
== CANCELLED)
printf("NOT SET ");
if (lopt == OBD_CFG_REC) {
printf("NOT SET ");
if (lopt == OBD_CFG_REC) {