diff for duplicates of <20120330200112.GK755@shiny> diff --git a/a/1.txt b/N1/1.txt index 92b963d..c7521e4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,41 +1,36 @@ On Fri, Mar 30, 2012 at 12:50:26PM -0700, Linus Torvalds wrote: -> On Fri, Mar 30, 2012 at 10:51 AM, Chris Mason <chris.mason@oracle.com= -> wrote: +> On Fri, Mar 30, 2012 at 10:51 AM, Chris Mason <chris.mason@oracle.com> wrote: > > -> > git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git= - for-linus ->=20 +> > git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus +> > This causes a new warning for me: ->=20 -> fs/btrfs/extent_io.c: In function =E2=80=98repair_eb_io_failure=E2=80= -=99: -> fs/btrfs/extent_io.c:1940:6: warning: =E2=80=98ret=E2=80=99 may be = -used +> +> fs/btrfs/extent_io.c: In function ‘repair_eb_io_failure’: +> fs/btrfs/extent_io.c:1940:6: warning: ‘ret’ may be used > uninitialized in this function -Interesting that my gcc doesn't warn here. Strictly speaking, gcc isn'= -t +Interesting that my gcc doesn't warn here. Strictly speaking, gcc isn't wrong, but num_extent_pages() will always be at least 1. This function is new in this pull, so it can't be a conflict. -Do you want a new pull with the ret =3D 0 patch? +Do you want a new pull with the ret = 0 patch? int repair_eb_io_failure(struct btrfs_root *root, struct extent_buffer *eb, int mirror_num) { - struct btrfs_mapping_tree *map_tree =3D &root->fs_info->mapping_tree; - u64 start =3D eb->start; - unsigned long i, num_pages =3D num_extent_pages(eb->start, eb->len); + struct btrfs_mapping_tree *map_tree = &root->fs_info->mapping_tree; + u64 start = eb->start; + unsigned long i, num_pages = num_extent_pages(eb->start, eb->len); int ret; - for (i =3D 0; i < num_pages; i++) { - struct page *p =3D extent_buffer_page(eb, i); - ret =3D repair_io_failure(map_tree, start, PAGE_CACHE_SIZE, + for (i = 0; i < num_pages; i++) { + struct page *p = extent_buffer_page(eb, i); + ret = repair_io_failure(map_tree, start, PAGE_CACHE_SIZE, start, p, mirror_num); if (ret) break; - start +=3D PAGE_CACHE_SIZE; + start += PAGE_CACHE_SIZE; } return ret; diff --git a/a/content_digest b/N1/content_digest index 25342ac..de7f3f6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,43 +9,38 @@ "\00:1\0" "b\0" "On Fri, Mar 30, 2012 at 12:50:26PM -0700, Linus Torvalds wrote:\n" - "> On Fri, Mar 30, 2012 at 10:51 AM, Chris Mason <chris.mason@oracle.com=\n" - "> wrote:\n" + "> On Fri, Mar 30, 2012 at 10:51 AM, Chris Mason <chris.mason@oracle.com> wrote:\n" "> >\n" - "> > git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git=\n" - " for-linus\n" - ">=20\n" + "> > git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus\n" + "> \n" "> This causes a new warning for me:\n" - ">=20\n" - "> fs/btrfs/extent_io.c: In function =E2=80=98repair_eb_io_failure=E2=80=\n" - "=99:\n" - "> fs/btrfs/extent_io.c:1940:6: warning: =E2=80=98ret=E2=80=99 may be =\n" - "used\n" + "> \n" + "> fs/btrfs/extent_io.c: In function \342\200\230repair_eb_io_failure\342\200\231:\n" + "> fs/btrfs/extent_io.c:1940:6: warning: \342\200\230ret\342\200\231 may be used\n" "> uninitialized in this function\n" "\n" - "Interesting that my gcc doesn't warn here. Strictly speaking, gcc isn'=\n" - "t\n" + "Interesting that my gcc doesn't warn here. Strictly speaking, gcc isn't\n" "wrong, but num_extent_pages() will always be at least 1. This function\n" "is new in this pull, so it can't be a conflict.\n" "\n" - "Do you want a new pull with the ret =3D 0 patch?\n" + "Do you want a new pull with the ret = 0 patch?\n" "\n" "int repair_eb_io_failure(struct btrfs_root *root, struct extent_buffer\n" "*eb,\n" "\t\t\t int mirror_num)\n" "{\n" - "\tstruct btrfs_mapping_tree *map_tree =3D &root->fs_info->mapping_tree;\n" - "\tu64 start =3D eb->start;\n" - "\tunsigned long i, num_pages =3D num_extent_pages(eb->start, eb->len);\n" + "\tstruct btrfs_mapping_tree *map_tree = &root->fs_info->mapping_tree;\n" + "\tu64 start = eb->start;\n" + "\tunsigned long i, num_pages = num_extent_pages(eb->start, eb->len);\n" "\tint ret;\n" "\n" - "\tfor (i =3D 0; i < num_pages; i++) {\n" - "\t\tstruct page *p =3D extent_buffer_page(eb, i);\n" - "\t\tret =3D repair_io_failure(map_tree, start, PAGE_CACHE_SIZE,\n" + "\tfor (i = 0; i < num_pages; i++) {\n" + "\t\tstruct page *p = extent_buffer_page(eb, i);\n" + "\t\tret = repair_io_failure(map_tree, start, PAGE_CACHE_SIZE,\n" "\t\t\t\t\tstart, p, mirror_num);\n" "\t\tif (ret)\n" "\t\t\tbreak;\n" - "\t\tstart +=3D PAGE_CACHE_SIZE;\n" + "\t\tstart += PAGE_CACHE_SIZE;\n" "\t}\n" "\n" "\treturn ret;\n" @@ -53,4 +48,4 @@ "\n" -chris -d0be245294e646af0c6ad29e59aff97a3cd8364253fe42a8b9036d776a1875a8 +1464846901156d2dc1bb4dc0f0a2fd174d54b9ddfc85d7dfddd3d4ac274f8dfd
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.