diff for duplicates of <1222803445.24609.2.camel@kitka.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 4a01fd2..9aac7d3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -77,7 +77,8 @@ Signed-off-by: Martin Peschke <mp3@de.ibm.com> 5 files changed, 1103 insertions(+), 1 deletion(-) Index: blktrace/blkiomon.c -=================================--- /dev/null +=================================================================== +--- /dev/null +++ blktrace/blkiomon.c @@ -0,0 +1,708 @@ +/* @@ -458,9 +459,9 @@ Index: blktrace/blkiomon.c + struct trace *t, *prev = NULL; + + for (t = thash[i]; t; t = t->next) { -+ if (t->bit.device = bit->device && -+ t->bit.sector = bit->sector && -+ action(t->bit.action) = action(bit->action)) { ++ if (t->bit.device == bit->device && ++ t->bit.sector == bit->sector && ++ action(t->bit.action) == action(bit->action)) { + if (prev) + prev->next = t->next; + else @@ -533,7 +534,7 @@ Index: blktrace/blkiomon.c + break; + } + -+ if (data_is_native = -1 && check_data_endianness(bit->magic)) ++ if (data_is_native == -1 && check_data_endianness(bit->magic)) + break; + + /* endianess */ @@ -611,7 +612,7 @@ Index: blktrace/blkiomon.c + if (!msg_q_id || msg_id <= 0) + return 1; + key = ftok(msg_q_name, msg_q_id); -+ if (key = -1) ++ if (key == -1) + return 1; + while (up) { + msg_q = msgget(key, S_IRWXU); @@ -789,12 +790,13 @@ Index: blktrace/blkiomon.c + return 0; +} Index: blktrace/Makefile -=================================--- blktrace.orig/Makefile +=================================================================== +--- blktrace.orig/Makefile +++ blktrace/Makefile @@ -1,7 +1,7 @@ CC = gcc CFLAGS = -Wall -O2 -g -W - ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITSd + ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -PROGS = blkparse blktrace verify_blkparse blkrawverify +PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon LIBS = -lpthread @@ -811,7 +813,8 @@ Index: blktrace/Makefile docs: Index: blktrace/blkiomon.h -=================================--- /dev/null +=================================================================== +--- /dev/null +++ blktrace/blkiomon.h @@ -0,0 +1,105 @@ +/* @@ -920,7 +923,8 @@ Index: blktrace/blkiomon.h + +#endif Index: blktrace/doc/blkiomon.8 -=================================--- /dev/null +=================================================================== +--- /dev/null +++ blktrace/doc/blkiomon.8 @@ -0,0 +1,116 @@ +.TH BLKIOMON 8 "July 17, 2008" "" "" @@ -1040,7 +1044,8 @@ Index: blktrace/doc/blkiomon.8 +btt (1) + Index: blktrace/stats.h -=================================--- /dev/null +=================================================================== +--- /dev/null +++ blktrace/stats.h @@ -0,0 +1,155 @@ +/* diff --git a/a/content_digest b/N1/content_digest index 02e061a..90c31c6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -84,7 +84,8 @@ " 5 files changed, 1103 insertions(+), 1 deletion(-)\n" "\n" "Index: blktrace/blkiomon.c\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ blktrace/blkiomon.c\n" "@@ -0,0 +1,708 @@\n" "+/*\n" @@ -465,9 +466,9 @@ "+\tstruct trace *t, *prev = NULL;\n" "+\n" "+\tfor (t = thash[i]; t; t = t->next) {\n" - "+\t\tif (t->bit.device = bit->device &&\n" - "+\t\t t->bit.sector = bit->sector &&\n" - "+\t\t action(t->bit.action) = action(bit->action)) {\n" + "+\t\tif (t->bit.device == bit->device &&\n" + "+\t\t t->bit.sector == bit->sector &&\n" + "+\t\t action(t->bit.action) == action(bit->action)) {\n" "+\t\t\tif (prev)\n" "+\t\t\t\tprev->next = t->next;\n" "+\t\t\telse\n" @@ -540,7 +541,7 @@ "+\t\t\tbreak;\n" "+\t\t}\n" "+\n" - "+\t\tif (data_is_native = -1 && check_data_endianness(bit->magic))\n" + "+\t\tif (data_is_native == -1 && check_data_endianness(bit->magic))\n" "+\t\t\tbreak;\n" "+\n" "+\t\t/* endianess */\n" @@ -618,7 +619,7 @@ "+\tif (!msg_q_id || msg_id <= 0)\n" "+\t\treturn 1;\n" "+\tkey = ftok(msg_q_name, msg_q_id);\n" - "+\tif (key = -1)\n" + "+\tif (key == -1)\n" "+\t\treturn 1;\n" "+\twhile (up) {\n" "+\t\tmsg_q = msgget(key, S_IRWXU);\n" @@ -796,12 +797,13 @@ "+\treturn 0;\n" "+}\n" "Index: blktrace/Makefile\n" - "=================================--- blktrace.orig/Makefile\n" + "===================================================================\n" + "--- blktrace.orig/Makefile\n" "+++ blktrace/Makefile\n" "@@ -1,7 +1,7 @@\n" " CC\t= gcc\n" " CFLAGS\t= -Wall -O2 -g -W\n" - " ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITSd\n" + " ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64\n" "-PROGS\t= blkparse blktrace verify_blkparse blkrawverify\n" "+PROGS\t= blkparse blktrace verify_blkparse blkrawverify blkiomon\n" " LIBS\t= -lpthread\n" @@ -818,7 +820,8 @@ " \n" " docs:\n" "Index: blktrace/blkiomon.h\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ blktrace/blkiomon.h\n" "@@ -0,0 +1,105 @@\n" "+/*\n" @@ -927,7 +930,8 @@ "+\n" "+#endif\n" "Index: blktrace/doc/blkiomon.8\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ blktrace/doc/blkiomon.8\n" "@@ -0,0 +1,116 @@\n" "+.TH BLKIOMON 8 \"July 17, 2008\" \"\" \"\"\n" @@ -1047,7 +1051,8 @@ "+btt (1)\n" "+\n" "Index: blktrace/stats.h\n" - "=================================--- /dev/null\n" + "===================================================================\n" + "--- /dev/null\n" "+++ blktrace/stats.h\n" "@@ -0,0 +1,155 @@\n" "+/*\n" @@ -1206,4 +1211,4 @@ "+\n" +#endif -a69825ea7ccec9ad4eb3e7be252f744d7b0dfd2f975a429f55352de035490d49 +d7c983ae0f4cbbf5a23cd50413b53bab2283bd7e8898a8e02ffec0e09b45ac52
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.