X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=blktrace.c;h=8ebbae6f2fbe788c3c2ee353385535dac68c90ce;hp=629aebed84d7b40ebcb58942f1383a6a8b0bdfae;hb=c69aa91fa88fe1f0372afe2a56c4e79c62fc49e0;hpb=eeb9c2aa5439dd6615ad69324f402f774173f6e5 diff --git a/blktrace.c b/blktrace.c index 629aebed..8ebbae6f 100644 --- a/blktrace.c +++ b/blktrace.c @@ -142,16 +142,16 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min) return found; } -#define MINORBITS 20 -#define MINORMASK ((1U << MINORBITS) - 1) -#define MAJOR(dev) ((unsigned int) ((dev) >> MINORBITS)) -#define MINOR(dev) ((unsigned int) ((dev) & MINORMASK)) +#define FMINORBITS 20 +#define FMINORMASK ((1U << FMINORBITS) - 1) +#define FMAJOR(dev) ((unsigned int) ((dev) >> FMINORBITS)) +#define FMINOR(dev) ((unsigned int) ((dev) & FMINORMASK)) static void trace_add_file(struct thread_data *td, __u32 device) { static unsigned int last_maj, last_min; - unsigned int maj = MAJOR(device); - unsigned int min = MINOR(device); + unsigned int maj = FMAJOR(device); + unsigned int min = FMINOR(device); struct fio_file *f; char dev[256]; unsigned int i;