diff for duplicates of <20090123144233.GE21737@ghostprotocols.net> diff --git a/a/1.txt b/N1/1.txt index df7dab6..0e5c586 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ instead, patch is the same. - Arnaldo -From b161071999a0bb5af44b40b49afafa8db19a7679 Mon Sep 17 00:00:00 2001 +>From b161071999a0bb5af44b40b49afafa8db19a7679 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo <acme@redhat.com> Date: Fri, 23 Jan 2009 11:41:27 -0200 Subject: [PATCH 2/2] blktrace: Add ftrace plugin @@ -236,7 +236,7 @@ index b0a2cae..630f167 100644 + if (blk_tr) { + ring_buffer_unlock_commit(blk_tr->buffer, event, flags); + if (pid != 0 && -+ (blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC) = 0 && ++ (blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC) == 0 && + (trace_flags & TRACE_ITER_STACKTRACE) != 0) + __trace_stack(blk_tr, NULL, flags, 5, pc); + trace_wake_up(); @@ -408,7 +408,7 @@ index b0a2cae..630f167 100644 + tracing_reset(tr, cpu); + + mutex_lock(&blk_probe_mutex); -+ if (atomic_add_return(1, &blk_probes_ref) = 1) ++ if (atomic_add_return(1, &blk_probes_ref) == 1) + if (blk_register_tracepoints()) + atomic_dec(&blk_probes_ref); + mutex_unlock(&blk_probe_mutex); @@ -473,7 +473,7 @@ index b0a2cae..630f167 100644 + const u16 what = t->action & ((1 << BLK_TC_SHIFT) - 1); + int ret; + -+ if (unlikely(what = 0 || what > ARRAY_SIZE(what2act))) ++ if (unlikely(what == 0 || what > ARRAY_SIZE(what2act))) + ret = trace_seq_printf(s, "Bad pc action %x\n", what); + else { + const bool long_act = !!(trace_flags & TRACE_ITER_VERBOSE); @@ -497,7 +497,7 @@ index b0a2cae..630f167 100644 + t = (const struct blk_io_trace *)iter->ent; + what = t->action & ((1 << BLK_TC_SHIFT) - 1); + -+ if (unlikely(what = 0 || what > ARRAY_SIZE(what2act))) ++ if (unlikely(what == 0 || what > ARRAY_SIZE(what2act))) + ret = trace_seq_printf(&iter->seq, "Bad pc action %x\n", what); + else { + const bool long_act = !!(trace_flags & TRACE_ITER_VERBOSE); @@ -552,7 +552,7 @@ index b0a2cae..630f167 100644 + struct blk_trace *bt; + + bt = xchg(&q->blk_trace, NULL); -+ if (bt = NULL) ++ if (bt == NULL) + return -EINVAL; + + kfree(bt); @@ -628,17 +628,17 @@ index b0a2cae..630f167 100644 + int value; + ssize_t ret = -ENXIO; + -+ if (count = 0 || sscanf(buf, "%d", &value) != 1) ++ if (count == 0 || sscanf(buf, "%d", &value) != 1) + goto out; + + lock_kernel(); + p = dev_to_part(dev); + bdev = bdget(part_devt(p)); -+ if (bdev = NULL) ++ if (bdev == NULL) + goto out_unlock_kernel; + + q = bdev_get_queue(bdev); -+ if (q = NULL) ++ if (q == NULL) + goto out_bdput; + + mutex_lock(&bdev->bd_mutex); @@ -648,7 +648,7 @@ index b0a2cae..630f167 100644 + ret = blk_trace_remove_queue(q); + mutex_unlock(&bdev->bd_mutex); + -+ if (ret = 0) ++ if (ret == 0) + ret = count; +out_bdput: + bdput(bdev); @@ -695,7 +695,7 @@ index b0a2cae..630f167 100644 + int mask = 0; + char *copy = kstrdup(str, GFP_KERNEL), *s; + -+ if (copy = NULL) ++ if (copy == NULL) + return -ENOMEM; + + s = strstrip(copy); @@ -706,28 +706,28 @@ index b0a2cae..630f167 100644 + if (sep != NULL) + *sep = '\0'; + -+ if (strcasecmp(s, "barrier") = 0) ++ if (strcasecmp(s, "barrier") == 0) + mask |= BLK_TC_BARRIER; -+ else if (strcasecmp(s, "complete") = 0) ++ else if (strcasecmp(s, "complete") == 0) + mask |= BLK_TC_COMPLETE; -+ else if (strcasecmp(s, "fs") = 0) ++ else if (strcasecmp(s, "fs") == 0) + mask |= BLK_TC_FS; -+ else if (strcasecmp(s, "issue") = 0) ++ else if (strcasecmp(s, "issue") == 0) + mask |= BLK_TC_ISSUE; -+ else if (strcasecmp(s, "pc") = 0) ++ else if (strcasecmp(s, "pc") == 0) + mask |= BLK_TC_PC; -+ else if (strcasecmp(s, "queue") = 0) ++ else if (strcasecmp(s, "queue") == 0) + mask |= BLK_TC_QUEUE; -+ else if (strcasecmp(s, "read") = 0) ++ else if (strcasecmp(s, "read") == 0) + mask |= BLK_TC_READ; -+ else if (strcasecmp(s, "requeue") = 0) ++ else if (strcasecmp(s, "requeue") == 0) + mask |= BLK_TC_REQUEUE; -+ else if (strcasecmp(s, "sync") = 0) ++ else if (strcasecmp(s, "sync") == 0) + mask |= BLK_TC_SYNC; -+ else if (strcasecmp(s, "write") = 0) ++ else if (strcasecmp(s, "write") == 0) + mask |= BLK_TC_WRITE; + -+ if (sep = NULL) ++ if (sep == NULL) + break; + + s = sep + 1; @@ -748,22 +748,22 @@ index b0a2cae..630f167 100644 + + lock_kernel(); + bdev = bdget(part_devt(p)); -+ if (bdev = NULL) ++ if (bdev == NULL) + goto out_unlock_kernel; + + q = bdev_get_queue(bdev); -+ if (q = NULL) ++ if (q == NULL) + goto out_bdput; + mutex_lock(&bdev->bd_mutex); -+ if (q->blk_trace = NULL) ++ if (q->blk_trace == NULL) + ret = sprintf(buf, "disabled\n"); -+ else if (attr = &dev_attr_act_mask) ++ else if (attr == &dev_attr_act_mask) + ret = sprintf(buf, "%#x\n", q->blk_trace->act_mask); -+ else if (attr = &dev_attr_pid) ++ else if (attr == &dev_attr_pid) + ret = sprintf(buf, "%u\n", q->blk_trace->pid); -+ else if (attr = &dev_attr_start_lba) ++ else if (attr == &dev_attr_start_lba) + ret = sprintf(buf, "%llu\n", q->blk_trace->start_lba); -+ else if (attr = &dev_attr_end_lba) ++ else if (attr == &dev_attr_end_lba) + ret = sprintf(buf, "%llu\n", q->blk_trace->end_lba); + mutex_unlock(&bdev->bd_mutex); +out_bdput: @@ -783,10 +783,10 @@ index b0a2cae..630f167 100644 + u64 value; + ssize_t ret = -ENXIO; + -+ if (count = 0) ++ if (count == 0) + goto out; + -+ if (attr = &dev_attr_act_mask) { ++ if (attr == &dev_attr_act_mask) { + if (sscanf(buf, "%llx", &value) != 1) { + /* Assume it is a list of trace category names */ + value = blk_str2act_mask(buf); @@ -799,26 +799,26 @@ index b0a2cae..630f167 100644 + lock_kernel(); + p = dev_to_part(dev); + bdev = bdget(part_devt(p)); -+ if (bdev = NULL) ++ if (bdev == NULL) + goto out_unlock_kernel; + + q = bdev_get_queue(bdev); -+ if (q = NULL) ++ if (q == NULL) + goto out_bdput; + + mutex_lock(&bdev->bd_mutex); + ret = 0; -+ if (q->blk_trace = NULL) ++ if (q->blk_trace == NULL) + ret = blk_trace_setup_queue(q, bdev->bd_dev); + -+ if (ret = 0) { -+ if (attr = &dev_attr_act_mask) ++ if (ret == 0) { ++ if (attr == &dev_attr_act_mask) + q->blk_trace->act_mask = value; -+ else if (attr = &dev_attr_pid) ++ else if (attr == &dev_attr_pid) + q->blk_trace->pid = value; -+ else if (attr = &dev_attr_start_lba) ++ else if (attr == &dev_attr_start_lba) + q->blk_trace->start_lba = value; -+ else if (attr = &dev_attr_end_lba) ++ else if (attr == &dev_attr_end_lba) + q->blk_trace->end_lba = value; + ret = count; + } diff --git a/a/content_digest b/N1/content_digest index 9348079..74c9416 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020090123140627.GD21737@ghostprotocols.net\0" "From\0Arnaldo Carvalho de Melo <acme@redhat.com>\0" "Subject\0Re: [PATCH tip 2/2] blktrace: Add ftrace plugin\0" - "Date\0Fri, 23 Jan 2009 14:42:33 +0000\0" + "Date\0Fri, 23 Jan 2009 12:42:33 -0200\0" "To\0Jens Axboe <jens.axboe@oracle.com>\0" "Cc\0Ingo Molnar <mingo@elte.hu>" Steven Rostedt <rostedt@goodmis.org> @@ -16,7 +16,7 @@ "\n" "- Arnaldo\n" "\n" - "From b161071999a0bb5af44b40b49afafa8db19a7679 Mon Sep 17 00:00:00 2001\n" + ">From b161071999a0bb5af44b40b49afafa8db19a7679 Mon Sep 17 00:00:00 2001\n" "From: Arnaldo Carvalho de Melo <acme@redhat.com>\n" "Date: Fri, 23 Jan 2009 11:41:27 -0200\n" "Subject: [PATCH 2/2] blktrace: Add ftrace plugin\n" @@ -248,7 +248,7 @@ "+\t\tif (blk_tr) {\n" "+\t\t\tring_buffer_unlock_commit(blk_tr->buffer, event, flags);\n" "+\t\t\tif (pid != 0 &&\n" - "+\t\t\t (blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC) = 0 &&\n" + "+\t\t\t (blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC) == 0 &&\n" "+\t\t\t (trace_flags & TRACE_ITER_STACKTRACE) != 0)\n" "+\t\t\t\t__trace_stack(blk_tr, NULL, flags, 5, pc);\n" "+\t\t\ttrace_wake_up();\n" @@ -420,7 +420,7 @@ "+\t\ttracing_reset(tr, cpu);\n" "+\n" "+\tmutex_lock(&blk_probe_mutex);\n" - "+\tif (atomic_add_return(1, &blk_probes_ref) = 1)\n" + "+\tif (atomic_add_return(1, &blk_probes_ref) == 1)\n" "+\t\tif (blk_register_tracepoints())\n" "+\t\t\tatomic_dec(&blk_probes_ref);\n" "+\tmutex_unlock(&blk_probe_mutex);\n" @@ -485,7 +485,7 @@ "+\tconst u16 what = t->action & ((1 << BLK_TC_SHIFT) - 1);\n" "+\tint ret;\n" "+\n" - "+\tif (unlikely(what = 0 || what > ARRAY_SIZE(what2act)))\n" + "+\tif (unlikely(what == 0 || what > ARRAY_SIZE(what2act)))\n" "+\t\tret = trace_seq_printf(s, \"Bad pc action %x\\n\", what);\n" "+\telse {\n" "+\t\tconst bool long_act = !!(trace_flags & TRACE_ITER_VERBOSE);\n" @@ -509,7 +509,7 @@ "+\tt = (const struct blk_io_trace *)iter->ent;\n" "+\twhat = t->action & ((1 << BLK_TC_SHIFT) - 1);\n" "+\n" - "+\tif (unlikely(what = 0 || what > ARRAY_SIZE(what2act)))\n" + "+\tif (unlikely(what == 0 || what > ARRAY_SIZE(what2act)))\n" "+\t\tret = trace_seq_printf(&iter->seq, \"Bad pc action %x\\n\", what);\n" "+\telse {\n" "+\t\tconst bool long_act = !!(trace_flags & TRACE_ITER_VERBOSE);\n" @@ -564,7 +564,7 @@ "+\tstruct blk_trace *bt;\n" "+\n" "+\tbt = xchg(&q->blk_trace, NULL);\n" - "+\tif (bt = NULL)\n" + "+\tif (bt == NULL)\n" "+\t\treturn -EINVAL;\n" "+\n" "+\tkfree(bt);\n" @@ -640,17 +640,17 @@ "+\tint value;\n" "+\tssize_t ret = -ENXIO;\n" "+\n" - "+\tif (count = 0 || sscanf(buf, \"%d\", &value) != 1)\n" + "+\tif (count == 0 || sscanf(buf, \"%d\", &value) != 1)\n" "+\t\tgoto out;\n" "+\n" "+\tlock_kernel();\n" "+\tp = dev_to_part(dev);\n" "+\tbdev = bdget(part_devt(p));\n" - "+\tif (bdev = NULL)\n" + "+\tif (bdev == NULL)\n" "+\t\tgoto out_unlock_kernel;\n" "+\n" "+\tq = bdev_get_queue(bdev);\n" - "+\tif (q = NULL)\n" + "+\tif (q == NULL)\n" "+\t\tgoto out_bdput;\n" "+\n" "+\tmutex_lock(&bdev->bd_mutex);\n" @@ -660,7 +660,7 @@ "+\t\tret = blk_trace_remove_queue(q);\n" "+\tmutex_unlock(&bdev->bd_mutex);\n" "+\n" - "+\tif (ret = 0)\n" + "+\tif (ret == 0)\n" "+\t\tret = count;\n" "+out_bdput:\n" "+\tbdput(bdev);\n" @@ -707,7 +707,7 @@ "+\tint mask = 0;\n" "+\tchar *copy = kstrdup(str, GFP_KERNEL), *s;\n" "+\n" - "+\tif (copy = NULL)\n" + "+\tif (copy == NULL)\n" "+\t\treturn -ENOMEM;\n" "+\n" "+\ts = strstrip(copy);\n" @@ -718,28 +718,28 @@ "+\t\tif (sep != NULL)\n" "+\t\t\t*sep = '\\0';\n" "+\n" - "+\t\tif (strcasecmp(s, \"barrier\") = 0)\n" + "+\t\tif (strcasecmp(s, \"barrier\") == 0)\n" "+\t\t\tmask |= BLK_TC_BARRIER;\n" - "+\t\telse if (strcasecmp(s, \"complete\") = 0)\n" + "+\t\telse if (strcasecmp(s, \"complete\") == 0)\n" "+\t\t\tmask |= BLK_TC_COMPLETE;\n" - "+\t\telse if (strcasecmp(s, \"fs\") = 0)\n" + "+\t\telse if (strcasecmp(s, \"fs\") == 0)\n" "+\t\t\tmask |= BLK_TC_FS;\n" - "+\t\telse if (strcasecmp(s, \"issue\") = 0)\n" + "+\t\telse if (strcasecmp(s, \"issue\") == 0)\n" "+\t\t\tmask |= BLK_TC_ISSUE;\n" - "+\t\telse if (strcasecmp(s, \"pc\") = 0)\n" + "+\t\telse if (strcasecmp(s, \"pc\") == 0)\n" "+\t\t\tmask |= BLK_TC_PC;\n" - "+\t\telse if (strcasecmp(s, \"queue\") = 0)\n" + "+\t\telse if (strcasecmp(s, \"queue\") == 0)\n" "+\t\t\tmask |= BLK_TC_QUEUE;\n" - "+\t\telse if (strcasecmp(s, \"read\") = 0)\n" + "+\t\telse if (strcasecmp(s, \"read\") == 0)\n" "+\t\t\tmask |= BLK_TC_READ;\n" - "+\t\telse if (strcasecmp(s, \"requeue\") = 0)\n" + "+\t\telse if (strcasecmp(s, \"requeue\") == 0)\n" "+\t\t\tmask |= BLK_TC_REQUEUE;\n" - "+\t\telse if (strcasecmp(s, \"sync\") = 0)\n" + "+\t\telse if (strcasecmp(s, \"sync\") == 0)\n" "+\t\t\tmask |= BLK_TC_SYNC;\n" - "+\t\telse if (strcasecmp(s, \"write\") = 0)\n" + "+\t\telse if (strcasecmp(s, \"write\") == 0)\n" "+\t\t\tmask |= BLK_TC_WRITE;\n" "+\n" - "+\t\tif (sep = NULL)\n" + "+\t\tif (sep == NULL)\n" "+\t\t\tbreak;\n" "+\n" "+\t\ts = sep + 1;\n" @@ -760,22 +760,22 @@ "+\n" "+\tlock_kernel();\n" "+\tbdev = bdget(part_devt(p));\n" - "+\tif (bdev = NULL)\n" + "+\tif (bdev == NULL)\n" "+\t\tgoto out_unlock_kernel;\n" "+\n" "+\tq = bdev_get_queue(bdev);\n" - "+\tif (q = NULL)\n" + "+\tif (q == NULL)\n" "+\t\tgoto out_bdput;\n" "+\tmutex_lock(&bdev->bd_mutex);\n" - "+\tif (q->blk_trace = NULL)\n" + "+\tif (q->blk_trace == NULL)\n" "+\t\tret = sprintf(buf, \"disabled\\n\");\n" - "+\telse if (attr = &dev_attr_act_mask)\n" + "+\telse if (attr == &dev_attr_act_mask)\n" "+\t\tret = sprintf(buf, \"%#x\\n\", q->blk_trace->act_mask);\n" - "+\telse if (attr = &dev_attr_pid)\n" + "+\telse if (attr == &dev_attr_pid)\n" "+\t\tret = sprintf(buf, \"%u\\n\", q->blk_trace->pid);\n" - "+\telse if (attr = &dev_attr_start_lba)\n" + "+\telse if (attr == &dev_attr_start_lba)\n" "+\t\tret = sprintf(buf, \"%llu\\n\", q->blk_trace->start_lba);\n" - "+\telse if (attr = &dev_attr_end_lba)\n" + "+\telse if (attr == &dev_attr_end_lba)\n" "+\t\tret = sprintf(buf, \"%llu\\n\", q->blk_trace->end_lba);\n" "+\tmutex_unlock(&bdev->bd_mutex);\n" "+out_bdput:\n" @@ -795,10 +795,10 @@ "+\tu64 value;\n" "+\tssize_t ret = -ENXIO;\n" "+\n" - "+\tif (count = 0)\n" + "+\tif (count == 0)\n" "+\t\tgoto out;\n" "+\n" - "+\tif (attr = &dev_attr_act_mask) {\n" + "+\tif (attr == &dev_attr_act_mask) {\n" "+\t\tif (sscanf(buf, \"%llx\", &value) != 1) {\n" "+\t\t\t/* Assume it is a list of trace category names */\n" "+\t\t\tvalue = blk_str2act_mask(buf);\n" @@ -811,26 +811,26 @@ "+\tlock_kernel();\n" "+\tp = dev_to_part(dev);\n" "+\tbdev = bdget(part_devt(p));\n" - "+\tif (bdev = NULL)\n" + "+\tif (bdev == NULL)\n" "+\t\tgoto out_unlock_kernel;\n" "+\n" "+\tq = bdev_get_queue(bdev);\n" - "+\tif (q = NULL)\n" + "+\tif (q == NULL)\n" "+\t\tgoto out_bdput;\n" "+\n" "+\tmutex_lock(&bdev->bd_mutex);\n" "+\tret = 0;\n" - "+\tif (q->blk_trace = NULL)\n" + "+\tif (q->blk_trace == NULL)\n" "+\t\tret = blk_trace_setup_queue(q, bdev->bd_dev);\n" "+\n" - "+\tif (ret = 0) {\n" - "+\t\tif (attr = &dev_attr_act_mask)\n" + "+\tif (ret == 0) {\n" + "+\t\tif (attr == &dev_attr_act_mask)\n" "+\t\t\tq->blk_trace->act_mask = value;\n" - "+\t\telse if (attr = &dev_attr_pid)\n" + "+\t\telse if (attr == &dev_attr_pid)\n" "+\t\t\tq->blk_trace->pid = value;\n" - "+\t\telse if (attr = &dev_attr_start_lba)\n" + "+\t\telse if (attr == &dev_attr_start_lba)\n" "+\t\t\tq->blk_trace->start_lba = value;\n" - "+\t\telse if (attr = &dev_attr_end_lba)\n" + "+\t\telse if (attr == &dev_attr_end_lba)\n" "+\t\t\tq->blk_trace->end_lba = value;\n" "+\t\tret = count;\n" "+\t}\n" @@ -882,4 +882,4 @@ "-- \n" 1.6.0.6 -abb3163e7673ac3ab31777452c2a0e7637907453f82cbb7253cb696f33b2d035 +a6c6e079b04fd72281350ff9078250cd26422ffdc33d3ea0d9a4154e13a984d5
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.