aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2021-02-19 10:36:08 -0600
committerJens Axboe <axboe@kernel.dk>2021-02-19 09:42:41 -0700
commit2ec0bb0b725305025dcc3e3f195894040e2dab90 (patch)
tree0343ffe3b204753595d3648b6509f83c9c5d83d6
parenta021a33b405b5101eec6c389e1dacd7934fdd35e (diff)
downloadblktrace-2ec0bb0b725305025dcc3e3f195894040e2dab90.tar.gz
blktrace: inclusive terminology
Use more inclusive terminology in a couple places. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--blkparse_fmt.c4
-rw-r--r--blktrace.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/blkparse_fmt.c b/blkparse_fmt.c
index df2f6ce..9b83d1d 100644
--- a/blkparse_fmt.c
+++ b/blkparse_fmt.c
@@ -276,12 +276,12 @@ static void print_field(char *act, struct per_cpu_info *pci,
static char *parse_field(char *act, struct per_cpu_info *pci,
struct blk_io_trace *t, unsigned long long elapsed,
int pdu_len, unsigned char *pdu_buf,
- char *master_format)
+ char *primary_format)
{
int minus = 0;
int has_w = 0;
int width = 0;
- char *p = master_format;
+ char *p = primary_format;
if (*p == '-') {
minus = 1;
diff --git a/blktrace.c b/blktrace.c
index d0d271f..82a6aad 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -307,7 +307,7 @@ static pthread_mutex_t dp_mutex = PTHREAD_MUTEX_INITIALIZER;
static volatile int dp_entries;
/*
- * These synchronize master / thread interactions.
+ * These synchronize main / thread interactions.
*/
static pthread_cond_t mt_cond = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t mt_mutex = PTHREAD_MUTEX_INITIALIZER;