diff for duplicates of <20190321083335.GA31210@kadam>
diff --git a/a/1.txt b/N1/1.txt
index 89b264b..bb7b5a9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -58,7 +58,7 @@ index c7b3b21123c1..a711bf61f60c 100644
- * 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)
@@ -81,7 +81,7 @@ index c7b3b21123c1..a711bf61f60c 100644
- 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;
- }
@@ -126,13 +126,13 @@ index c7b3b21123c1..a711bf61f60c 100644
+
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
@@ -141,7 +141,7 @@ index c7b3b21123c1..a711bf61f60c 100644
(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);
@@ -149,4 +149,9 @@ index c7b3b21123c1..a711bf61f60c 100644
/*
* 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 255bfa9..123c9d1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,7 +5,7 @@
"Subject\0[PATCH] drm/i915/selftests: fix NULL vs IS_ERR() check in mock_context_barrier()\0"
]
[
- "Date\0Thu, 21 Mar 2019 08:33:35 +0000\0"
+ "Date\0Thu, 21 Mar 2019 11:33:35 +0300\0"
]
[
"To\0Jani Nikula <jani.nikula\@linux.intel.com>",
@@ -84,7 +84,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",
@@ -107,7 +107,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",
@@ -152,13 +152,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",
@@ -167,7 +167,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",
@@ -175,7 +175,12 @@
" \t\t\t/*\n",
" \t\t\t * impossible to be !PagePrivate(page) for\n",
"-- \n",
- "2.17.1"
+ "2.17.1\n",
+ "\n",
+ "_______________________________________________\n",
+ "Intel-gfx mailing list\n",
+ "Intel-gfx\@lists.freedesktop.org\n",
+ "https://lists.freedesktop.org/mailman/listinfo/intel-gfx"
]
-a4210b9a3c1c104b1493902fee23a5940373244cd25d94559c50b2f2253844b9
+b32b65cec8c5ac50a37a3642355a68acf60f225bf18a6cf5c4a85ca26ce15d72
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.