From: Theodore Ts'o <tytso@mit.edu>
To: xfs@oss.sgi.com
Cc: Theodore Ts'o <tytso@mit.edu>, fstests@vger.kernel.org
Subject: [PATCH 4/6] xfsprogs: avoid use of si_tid in struct xlog_split_item
Date: Sun, 26 Jul 2015 08:20:53 -0400 [thread overview]
Message-ID: <1437913255-7524-5-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1437913255-7524-1-git-send-email-tytso@mit.edu>
In Android's bionic libc (as well as the Linux kernel's
include/uapi/asm-generic/siginfo.h), si_tid is a #define to provide
backwards compatibility for the timerid in the siginfo structure.
This breaks the compile of logprint/log_misc.c. Change this to be
si_xtid in order to avoid a namespace collision
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
logprint/log_misc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index c9286c6..c0a5c97 100644
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -76,7 +76,7 @@ char *trans_type[] = {
typedef struct xlog_split_item {
struct xlog_split_item *si_next;
struct xlog_split_item *si_prev;
- xlog_tid_t si_tid;
+ xlog_tid_t si_xtid;
int si_skip;
} xlog_split_item_t;
@@ -161,7 +161,7 @@ xlog_print_add_to_trans(xlog_tid_t tid,
xlog_split_item_t *item;
item = (xlog_split_item_t *)calloc(sizeof(xlog_split_item_t), 1);
- item->si_tid = tid;
+ item->si_xtid = tid;
item->si_skip = skip;
item->si_next = split_list;
item->si_prev = NULL;
@@ -183,7 +183,7 @@ xlog_print_find_tid(xlog_tid_t tid, uint was_cont)
return 0;
}
while (listp) {
- if (listp->si_tid == tid)
+ if (listp->si_xtid == tid)
break;
listp = listp->si_next;
}
--
2.3.0
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-07-26 12:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-26 12:20 [PATCH 0/6] Add cross-compilation support for android Theodore Ts'o
2015-07-26 12:20 ` [PATCH 1/6] xfsprogs: define NBBY if not defined by the system header files Theodore Ts'o
2015-07-30 17:07 ` Christoph Hellwig
2015-07-26 12:20 ` [PATCH 2/6] xfsprogs: pull in libgen.h to get prototype for basename() Theodore Ts'o
2015-07-30 17:11 ` Christoph Hellwig
2015-07-26 12:20 ` [PATCH 3/6] xfsprogs: define and use BUILD_CC in configure.ac for cross compilation Theodore Ts'o
2015-07-30 17:10 ` Christoph Hellwig
2016-02-01 21:25 ` xfsprogs: Add BUILD_CFLAGS " Gwendal Grignou
2016-02-02 18:08 ` Christoph Hellwig
2016-05-27 16:34 ` Gwendal Grignou
2016-05-31 12:51 ` Christoph Hellwig
2016-05-31 16:19 ` Gwendal Grignou
2015-07-26 12:20 ` Theodore Ts'o [this message]
2015-07-30 17:11 ` [PATCH 4/6] xfsprogs: avoid use of si_tid in struct xlog_split_item Christoph Hellwig
2015-07-26 12:20 ` [PATCH 5/6] xfsprogs: use "unsigned short" instead of ushort Theodore Ts'o
2015-07-30 17:09 ` Christoph Hellwig
2015-07-26 12:20 ` [PATCH 6/6] xfsprogs: add missing include of <stat.h> Theodore Ts'o
2015-07-30 17:10 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437913255-7524-5-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=fstests@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox