From: Jan Kara Date: Thu, 5 May 2016 15:17:10 +0000 (+0200) Subject: Don't prepend blktrace destination dir if we didn't run blktrace X-Git-Tag: blktrace-1.2.0~9 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8a544092665186e483d55c57adc66d033dbb3bd3;p=blktrace.git Don't prepend blktrace destination dir if we didn't run blktrace When user specifies trace files directly via -t option, it doesn't make sense to prepend blktrace destination directory to them (it is especially confusing if you specify absolute path names with -t option and this logic breaks the path names). So avoid that. Signed-off-by: Jan Kara Signed-off-by: Jens Axboe --- diff --git a/iowatcher/main.c b/iowatcher/main.c index 28ff4cb..2d0349c 100644 --- a/iowatcher/main.c +++ b/iowatcher/main.c @@ -328,7 +328,10 @@ static void read_traces(void) char *path = NULL; list_for_each_entry(tf, &all_traces, list) { - path = join_path(blktrace_dest_dir, tf->filename); + if (num_blktrace_devices) + path = join_path(blktrace_dest_dir, tf->filename); + else + path = strdup(tf->filename); trace = open_trace(path); if (!trace)