diff for duplicates of <8736ng1u4f.fsf@gaia.fi.intel.com>
diff --git a/a/1.txt b/N1/1.txt
index 3d4e1b3..6921d00 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -67,7 +67,7 @@ The rest of the diff is unrelated tho, please resend.
> - * If mc has not gotten, it equals NULL,
> - * however, page->mapping never be NULL if working properly.
> - */
-> - cachemngd = (page->mapping = mc);
+> - cachemngd = (page->mapping == mc);
> -#endif
> + /* sbi should already be gotten if the page is managed */
> + if (sbi)
@@ -90,7 +90,7 @@ The rest of the diff is unrelated tho, please resend.
> - if (z_erofs_is_stagingpage(page))
> - continue;
> -#ifdef EROFS_FS_HAS_MANAGED_CACHE
-> - if (page->mapping = MNGD_MAPPING(sbi)) {
+> - if (page->mapping == MNGD_MAPPING(sbi)) {
> - DBG_BUGON(!PageUptodate(page));
> - continue;
> - }
@@ -135,13 +135,13 @@ The rest of the diff is unrelated tho, please resend.
> +
> llen = (nr_pages << PAGE_SHIFT) - work->pageofs;
>
-> if (z_erofs_vle_workgrp_fmt(grp) = Z_EROFS_VLE_WORKGRP_FMT_PLAIN) {
+> if (z_erofs_vle_workgrp_fmt(grp) == Z_EROFS_VLE_WORKGRP_FMT_PLAIN) {
> @@ -1044,10 +1046,9 @@ static int z_erofs_vle_unzip(struct super_block *sb,
> for (i = 0; i < clusterpages; ++i) {
> page = compressed_pages[i];
>
> -#ifdef EROFS_FS_HAS_MANAGED_CACHE
-> - if (page->mapping = MNGD_MAPPING(sbi))
+> - if (page->mapping == MNGD_MAPPING(sbi))
> + if (erofs_page_is_managed(sbi, page))
> continue;
> -#endif
@@ -150,7 +150,7 @@ The rest of the diff is unrelated tho, please resend.
> (void)z_erofs_gather_if_stagingpage(page_pool, page);
>
> @@ -1198,6 +1199,7 @@ pickup_page_for_submission(struct z_erofs_vle_workgroup *grp,
-> if (page->mapping = mc) {
+> if (page->mapping == mc) {
> WRITE_ONCE(grp->compressed_pages[nr], page);
>
> + ClearPageError(page);
@@ -158,4 +158,8 @@ The rest of the diff is unrelated tho, please resend.
> /*
> * impossible to be !PagePrivate(page) for
> --
-> 2.17.1
\ No newline at end of file
+> 2.17.1
+_______________________________________________
+Intel-gfx mailing list
+Intel-gfx@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/intel-gfx
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 0e863cb..9b4d9cc 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0Re: [PATCH] drm/i915/selftests: fix NULL vs IS_ERR() check in mock_context_barrier()\0"
]
[
- "Date\0Thu, 21 Mar 2019 08:58:40 +0000\0"
+ "Date\0Thu, 21 Mar 2019 10:58:40 +0200\0"
]
[
"To\0Dan Carpenter <dan.carpenter\@oracle.com>",
@@ -97,7 +97,7 @@
"> -\t\t * If mc has not gotten, it equals NULL,\n",
"> -\t\t * however, page->mapping never be NULL if working properly.\n",
"> -\t\t */\n",
- "> -\t\tcachemngd = (page->mapping = mc);\n",
+ "> -\t\tcachemngd = (page->mapping == mc);\n",
"> -#endif\n",
"> +\t\t/* sbi should already be gotten if the page is managed */\n",
"> +\t\tif (sbi)\n",
@@ -120,7 +120,7 @@
"> -\t\tif (z_erofs_is_stagingpage(page))\n",
"> -\t\t\tcontinue;\n",
"> -#ifdef EROFS_FS_HAS_MANAGED_CACHE\n",
- "> -\t\tif (page->mapping = MNGD_MAPPING(sbi)) {\n",
+ "> -\t\tif (page->mapping == MNGD_MAPPING(sbi)) {\n",
"> -\t\t\tDBG_BUGON(!PageUptodate(page));\n",
"> -\t\t\tcontinue;\n",
"> -\t\t}\n",
@@ -165,13 +165,13 @@
"> +\n",
"> \tllen = (nr_pages << PAGE_SHIFT) - work->pageofs;\n",
"> \n",
- "> \tif (z_erofs_vle_workgrp_fmt(grp) = Z_EROFS_VLE_WORKGRP_FMT_PLAIN) {\n",
+ "> \tif (z_erofs_vle_workgrp_fmt(grp) == Z_EROFS_VLE_WORKGRP_FMT_PLAIN) {\n",
"> \@\@ -1044,10 +1046,9 \@\@ static int z_erofs_vle_unzip(struct super_block *sb,\n",
"> \tfor (i = 0; i < clusterpages; ++i) {\n",
"> \t\tpage = compressed_pages[i];\n",
"> \n",
"> -#ifdef EROFS_FS_HAS_MANAGED_CACHE\n",
- "> -\t\tif (page->mapping = MNGD_MAPPING(sbi))\n",
+ "> -\t\tif (page->mapping == MNGD_MAPPING(sbi))\n",
"> +\t\tif (erofs_page_is_managed(sbi, page))\n",
"> \t\t\tcontinue;\n",
"> -#endif\n",
@@ -180,7 +180,7 @@
"> \t\t(void)z_erofs_gather_if_stagingpage(page_pool, page);\n",
"> \n",
"> \@\@ -1198,6 +1199,7 \@\@ pickup_page_for_submission(struct z_erofs_vle_workgroup *grp,\n",
- "> \tif (page->mapping = mc) {\n",
+ "> \tif (page->mapping == mc) {\n",
"> \t\tWRITE_ONCE(grp->compressed_pages[nr], page);\n",
"> \n",
"> +\t\tClearPageError(page);\n",
@@ -188,7 +188,11 @@
"> \t\t\t/*\n",
"> \t\t\t * impossible to be !PagePrivate(page) for\n",
"> -- \n",
- "> 2.17.1"
+ "> 2.17.1\n",
+ "_______________________________________________\n",
+ "Intel-gfx mailing list\n",
+ "Intel-gfx\@lists.freedesktop.org\n",
+ "https://lists.freedesktop.org/mailman/listinfo/intel-gfx"
]
-7f8fff41e3010d09fbac517c3c070d9d48688fe6da5ebb20666100ae571ef87c
+90a138186a8f1a586d81bae58004fb30307648ca0bcf640bdd446e2167749e20
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.