diff for duplicates of <20100906210543.34c2dbad@notabene> diff --git a/a/1.txt b/N1/1.txt index 8141b1a..e8ad8ff 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -54,7 +54,7 @@ walter harms <wharms@bfs.de> wrote: > > - 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)) { @@ -63,7 +63,7 @@ walter harms <wharms@bfs.de> wrote: > > - 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; > > - } @@ -89,7 +89,7 @@ clearly. -> > + 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)) > > + continue; diff --git a/a/content_digest b/N1/content_digest index 8cbb1ab..a703f6c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,7 +6,7 @@ "ref\04C849BA4.1080106@bfs.de\0" "From\0Neil Brown <neilb@suse.de>\0" "Subject\0Re: [PATCH] md: do not use ++ in rcu_dereference() argument\0" - "Date\0Mon, 06 Sep 2010 11:05:43 +0000\0" + "Date\0Mon, 6 Sep 2010 21:05:43 +1000\0" "To\0wharms@bfs.de\0" "Cc\0Sam Ravnborg <sam@ravnborg.org>" Kulikov Vasiliy <segooon@gmail.com> @@ -72,7 +72,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" @@ -81,7 +81,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" @@ -107,7 +107,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" "> > +\t\t\tcontinue;\n" @@ -143,4 +143,4 @@ "\n" NeilBrown -379fab6f33f95bf76be97c02c8c3a6690f966a80e8fc17b25288dc9eef2ee14a +1acc00ec0ef86ad40df8c4b16f1e2528321e5227e3117025176d5e2297b02e57
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.