diff for duplicates of <20100908170428.08372cce@notabene> diff --git a/a/1.txt b/N1/1.txt index 98b5b9b..d57e094 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -77,7 +77,7 @@ I've moved 'sectors' up near 'this_sector' but nothing else. > > - new_disk = 0; > > - > > - for (rdev = rcu_dereference(conf->mirrors[new_disk].rdev); -> > - r1_bio->bios[new_disk] = IO_BLOCKED || +> > - r1_bio->bios[new_disk] == IO_BLOCKED || > > - !rdev || !test_bit(In_sync, &rdev->flags) > > - || test_bit(WriteMostly, &rdev->flags); > > - rdev = rcu_dereference(conf->mirrors[++new_disk].rdev)) { @@ -86,7 +86,7 @@ I've moved 'sectors' up near 'this_sector' but nothing else. > > - r1_bio->bios[new_disk] != IO_BLOCKED) > > - wonly_disk = new_disk; > > - -> > - if (new_disk = conf->raid_disks - 1) { +> > - if (new_disk == conf->raid_disks - 1) { > > - new_disk = wonly_disk; > > - break; > > - } @@ -102,7 +102,7 @@ I've moved 'sectors' up near 'this_sector' but nothing else. > > - > > /* make sure the disk is operational */ > > - for (rdev = rcu_dereference(conf->mirrors[new_disk].rdev); -> > - r1_bio->bios[new_disk] = IO_BLOCKED || +> > - r1_bio->bios[new_disk] == IO_BLOCKED || > > - !rdev || !test_bit(In_sync, &rdev->flags) || > > - test_bit(WriteMostly, &rdev->flags); > > - rdev = rcu_dereference(conf->mirrors[new_disk].rdev)) { @@ -114,7 +114,7 @@ I've moved 'sectors' up near 'this_sector' but nothing else. > > - if (new_disk <= 0) > > - new_disk = conf->raid_disks; > > - new_disk--; -> > - if (new_disk = disk) { +> > - if (new_disk == disk) { > > - new_disk = wonly_disk; > > - break; > > + for (i = 0 ; i < conf->raid_disks ; i++) { @@ -131,7 +131,7 @@ Still disagree - sorry. > > > + -> > + if (r1_bio->bios[disk] = IO_BLOCKED +> > + if (r1_bio->bios[disk] == IO_BLOCKED > > + || !(rdev = rcu_dereference(conf->mirrors[disk].rdev)) > > + || !test_bit(In_sync, &rdev->flags)) > The rather complex expression - which includes a well hidden assignment - @@ -161,7 +161,7 @@ than 'abstraction'. > > } > > > > @@ -491,20 +474,20 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio) -> > if (this_sector = conf->mirrors[new_disk].head_position) +> > if (this_sector == conf->mirrors[new_disk].head_position) > > goto rb_out; > > > > - current_distance = abs(this_sector - conf->mirrors[disk].head_position); @@ -199,10 +199,10 @@ Suggestions on a comment that would make that clearer? > > - > > - rdev = rcu_dereference(conf->mirrors[disk].rdev); > > - -> > - if (!rdev || r1_bio->bios[disk] = IO_BLOCKED || +> > - if (!rdev || r1_bio->bios[disk] == IO_BLOCKED || > > - !test_bit(In_sync, &rdev->flags) || > > - test_bit(WriteMostly, &rdev->flags)) -> > + if (r1_bio->bios[disk] = IO_BLOCKED +> > + if (r1_bio->bios[disk] == IO_BLOCKED > > + || !(rdev = rcu_dereference(conf->mirrors[disk].rdev)) > > + || !test_bit(In_sync, &rdev->flags) > > + || test_bit(WriteMostly, &rdev->flags)) diff --git a/a/content_digest b/N1/content_digest index 8e92787..4e9e235 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,7 +6,7 @@ "ref\020100906192128.GA4760@merkur.ravnborg.org\0" "From\0Neil Brown <neilb@suse.de>\0" "Subject\0Re: [PATCH] md: do not use ++ in rcu_dereference() argument\0" - "Date\0Wed, 08 Sep 2010 07:04:28 +0000\0" + "Date\0Wed, 8 Sep 2010 17:04:28 +1000\0" "To\0Sam Ravnborg <sam@ravnborg.org>\0" "Cc\0Kulikov Vasiliy <segooon@gmail.com>" kernel-janitors@vger.kernel.org @@ -94,7 +94,7 @@ "> > -\t\tnew_disk = 0;\n" "> > -\n" "> > -\t\tfor (rdev = rcu_dereference(conf->mirrors[new_disk].rdev);\n" - "> > -\t\t r1_bio->bios[new_disk] = IO_BLOCKED ||\n" + "> > -\t\t r1_bio->bios[new_disk] == IO_BLOCKED ||\n" "> > -\t\t !rdev || !test_bit(In_sync, &rdev->flags)\n" "> > -\t\t\t || test_bit(WriteMostly, &rdev->flags);\n" "> > -\t\t rdev = rcu_dereference(conf->mirrors[++new_disk].rdev)) {\n" @@ -103,7 +103,7 @@ "> > -\t\t\t\tr1_bio->bios[new_disk] != IO_BLOCKED)\n" "> > -\t\t\t\twonly_disk = new_disk;\n" "> > -\n" - "> > -\t\t\tif (new_disk = conf->raid_disks - 1) {\n" + "> > -\t\t\tif (new_disk == conf->raid_disks - 1) {\n" "> > -\t\t\t\tnew_disk = wonly_disk;\n" "> > -\t\t\t\tbreak;\n" "> > -\t\t\t}\n" @@ -119,7 +119,7 @@ "> > -\n" "> > \t/* make sure the disk is operational */\n" "> > -\tfor (rdev = rcu_dereference(conf->mirrors[new_disk].rdev);\n" - "> > -\t r1_bio->bios[new_disk] = IO_BLOCKED ||\n" + "> > -\t r1_bio->bios[new_disk] == IO_BLOCKED ||\n" "> > -\t !rdev || !test_bit(In_sync, &rdev->flags) ||\n" "> > -\t\t test_bit(WriteMostly, &rdev->flags);\n" "> > -\t rdev = rcu_dereference(conf->mirrors[new_disk].rdev)) {\n" @@ -131,7 +131,7 @@ "> > -\t\tif (new_disk <= 0)\n" "> > -\t\t\tnew_disk = conf->raid_disks;\n" "> > -\t\tnew_disk--;\n" - "> > -\t\tif (new_disk = disk) {\n" + "> > -\t\tif (new_disk == disk) {\n" "> > -\t\t\tnew_disk = wonly_disk;\n" "> > -\t\t\tbreak;\n" "> > +\tfor (i = 0 ; i < conf->raid_disks ; i++) {\n" @@ -148,7 +148,7 @@ "\n" "> \n" "> > +\n" - "> > +\t\tif (r1_bio->bios[disk] = IO_BLOCKED\n" + "> > +\t\tif (r1_bio->bios[disk] == IO_BLOCKED\n" "> > +\t\t || !(rdev = rcu_dereference(conf->mirrors[disk].rdev))\n" "> > +\t\t || !test_bit(In_sync, &rdev->flags))\n" "> The rather complex expression - which includes a well hidden assignment -\n" @@ -178,7 +178,7 @@ "> > \t}\n" "> > \n" "> > @@ -491,20 +474,20 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio)\n" - "> > \tif (this_sector = conf->mirrors[new_disk].head_position)\n" + "> > \tif (this_sector == conf->mirrors[new_disk].head_position)\n" "> > \t\tgoto rb_out;\n" "> > \n" "> > -\tcurrent_distance = abs(this_sector - conf->mirrors[disk].head_position);\n" @@ -216,10 +216,10 @@ "> > -\n" "> > -\t\trdev = rcu_dereference(conf->mirrors[disk].rdev);\n" "> > -\n" - "> > -\t\tif (!rdev || r1_bio->bios[disk] = IO_BLOCKED ||\n" + "> > -\t\tif (!rdev || r1_bio->bios[disk] == IO_BLOCKED ||\n" "> > -\t\t !test_bit(In_sync, &rdev->flags) ||\n" "> > -\t\t test_bit(WriteMostly, &rdev->flags))\n" - "> > +\t\tif (r1_bio->bios[disk] = IO_BLOCKED\n" + "> > +\t\tif (r1_bio->bios[disk] == IO_BLOCKED\n" "> > +\t\t || !(rdev = rcu_dereference(conf->mirrors[disk].rdev))\n" "> > +\t\t || !test_bit(In_sync, &rdev->flags)\n" "> > +\t\t || test_bit(WriteMostly, &rdev->flags))\n" @@ -258,4 +258,4 @@ "> \n" "> \tSam" -6cafbe149f8ad98a85b4a07a56c43ad879feace55e9169ff9663ba3025d2c219 +77e4e0a492b886d462bdc8647ae7789ef3899a17b00009b6b1720e04dd16e717
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.