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>

diff --git a/blkparse_fmt.c b/blkparse_fmt.c
index df2f6ce2148a473e20f5cd9afd381f0021bfd42d..9b83d1db747624a79981ff6aecab4940eb2bae36 100644 (file)
--- 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 d0d271f9add5106b4481321058787f1ba1aa82a4..82a6aad25b85f0291f0e028eb46e3940c5a438b6 100644 (file)
--- 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;