On Thu, 08 Feb 2007 00:56:01 +0100
Richard Knutsson <[email protected]> wrote:
> Josh Triplett wrote:
> > The for loop in rcutorture_init uses the condition
> > cur_ops = torture_ops[i], cur_ops
> > but then makes the same assignment to cur_ops inside the loop. Remove the
> > redundant assignment inside the loop, and remove now-unnecessary braces.
> >
> > Signed-off-by: Josh Triplett <[email protected]>
> > ---
> > kernel/rcutorture.c | 7 ++-----
> > 1 files changed, 2 insertions(+), 5 deletions(-)
> >
> > diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
> > index 0c7bf0c..7258bcb 100644
> > --- a/kernel/rcutorture.c
> > +++ b/kernel/rcutorture.c
> > @@ -875,12 +875,9 @@ rcu_torture_init(void)
> >
> > /* Process args and tell the world that the torturer is on the job. */
> >
> > - for (i = 0; cur_ops = torture_ops[i], cur_ops; i++) {
> > - cur_ops = torture_ops[i];
> > - if (strcmp(torture_type, cur_ops->name) == 0) {
> > + for (i = 0; cur_ops = torture_ops[i], cur_ops; i++)
> >
> May be tired right now, but wouldn't it be more logical with:
>
> for (i = 0; cur_ops = torture_ops[i], i++)
>
> Right now it seems to have two conditions for cur_ops.
>
I suspect we can do better than that...
--- a/kernel/rcutorture.c~rcutorture-remove-redundant-assignment-to-cur_ops-in
+++ a/kernel/rcutorture.c
@@ -569,10 +569,6 @@ static struct rcu_torture_ops sched_ops
.name = "sched"
};
-static struct rcu_torture_ops *torture_ops[] =
- { &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops,
- &srcu_ops, &qrcu_ops, &sched_ops, NULL };
-
/*
* RCU torture writer kthread. Repeatedly substitutes a new structure
* for that pointed to by rcu_torture_current, freeing the old structure
@@ -939,14 +935,15 @@ rcu_torture_init(void)
int i;
int cpu;
int firsterr = 0;
+ static struct rcu_torture_ops *torture_ops[] =
+ { &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops,
+ &srcu_ops, &qrcu_ops, &sched_ops, };
/* Process args and tell the world that the torturer is on the job. */
-
- for (i = 0; cur_ops = torture_ops[i], cur_ops; i++) {
+ for (i = 0; i < ARRAY_SIZE(torture_ops); i++) {
cur_ops = torture_ops[i];
- if (strcmp(torture_type, cur_ops->name) == 0) {
+ if (strcmp(torture_type, cur_ops->name) == 0)
break;
- }
}
if (cur_ops == NULL) {
printk(KERN_ALERT "rcutorture: invalid torture type: \"%s\"\n",
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
