Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1890371/?format=api
{ "id": 1890371, "url": "http://patchwork.ozlabs.org/api/patches/1890371/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-mtd/patch/20240124175302.1750912-16-willy@infradead.org/", "project": { "id": 3, "url": "http://patchwork.ozlabs.org/api/projects/3/?format=api", "name": "Linux MTD development", "link_name": "linux-mtd", "list_id": "linux-mtd.lists.infradead.org", "list_email": "linux-mtd@lists.infradead.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20240124175302.1750912-16-willy@infradead.org>", "list_archive_url": null, "date": "2024-01-24T17:52:58", "name": "[v2,15/15] ubifs: Convert populate_page() to take a folio", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b40445d09661b0fbcac6fd497cc6dc4ddcde969f", "submitter": { "id": 70855, "url": "http://patchwork.ozlabs.org/api/people/70855/?format=api", "name": "Matthew Wilcox", "email": "willy@infradead.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-mtd/patch/20240124175302.1750912-16-willy@infradead.org/mbox/", "series": [ { "id": 391975, "url": "http://patchwork.ozlabs.org/api/series/391975/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-mtd/list/?series=391975", "date": "2024-01-24T17:52:56", "name": "ubifs folio conversion", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/391975/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1890371/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1890371/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=r+gDjQqG;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256\n header.s=casper.20170209 header.b=omFWOdRf;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4TKs5Z6YGlz23f0\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 25 Jan 2024 04:53:54 +1100 (AEDT)", "from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux))\n\tid 1rShRN-004a7H-0H;\n\tWed, 24 Jan 2024 17:53:33 +0000", "from casper.infradead.org ([2001:8b0:10b:1236::1])\n\tby bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux))\n\tid 1rShRL-004a5e-2a\n\tfor linux-mtd@bombadil.infradead.org;\n\tWed, 24 Jan 2024 17:53:31 +0000", "from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red\n Hat Linux))\n\tid 1rShQw-00000007LW0-0g0t;\n\tWed, 24 Jan 2024 17:53:06 +0000" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=5VEQ7ubtcKYXaG0zqk4DOnOtrLE3GUoBMVO3HP13OeU=; b=r+gDjQqGg/1hNp\n\tqEFc/M5PceqI0x9giFcX4XI1lIcNmkQrUURJQYSCShgOANyq+2KHn7YQPwXSM5bkCVzUHN8+OfD/w\n\t9YRcqwxE8R1a7RGwB6E3/w5KQ3DjOVuWhYyHI+iMclSkUos5ZfIlGTT9FkKg3klfiR/d5LWuIMVDn\n\tmVqaRs46hxbKdf4GmNzIYwA2YVum/2T4yk8Y9ssglyH2xVKjOXKul3VD+evZ4qimSIsVW2Egl9WKd\n\tlZs1HSu1JT1w3PV3x1P+I88CinTgRMyZcqy0tmLPz/f31pCYmTms0l6py728VZ8Vhfnh8TbGTeJkR\n\tCFOzRkFG4gWcyPJFneCQ==;", "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version:\n\tReferences:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:\n\tContent-Type:Content-ID:Content-Description;\n\tbh=uCHbLgCV9zy7rGbnpECRVHQsD31NrJzQDK4qy5/rI/M=; b=omFWOdRf62F2ZE7txGOEATmH3C\n\tQYGJIh5JbgHpWNmN8VsTeitTxyH/4Xsaliw5E99ov2JXSVdQleYzBMH7l4zPDPIwKZGNUqgsJ116D\n\tVyhJfeIlUxcnAwOZjv3VpUsa2hmkhWWvROBh6d2NR/9FBL0W8fI8qTEFr+sclX46jpMB8kKlAdbci\n\tR4smK/LjOVnQl1ceo9u9x99M+pMnTimLubhwx1mIPHaOLTlXTRAVbRNYLnHlTMeqWmL3zSj/Wc7vv\n\tKCNsfaOiCTM0XHCzqM316W+RsedU9VP2d+L09bTVrfAKxu0X0YH31vS3LoD3Hd7NsoYSBPa69MRlW\n\tDWtkVuNw==;" ], "From": "\"Matthew Wilcox (Oracle)\" <willy@infradead.org>", "To": "Richard Weinberger <richard@nod.at>", "Cc": "\"Matthew Wilcox (Oracle)\" <willy@infradead.org>,\n\tlinux-mtd@lists.infradead.org,\n\tZhihao Cheng <chengzhihao1@huawei.com>", "Subject": "[PATCH v2 15/15] ubifs: Convert populate_page() to take a folio", "Date": "Wed, 24 Jan 2024 17:52:58 +0000", "Message-ID": "<20240124175302.1750912-16-willy@infradead.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240124175302.1750912-1-willy@infradead.org>", "References": "<20240124175302.1750912-1-willy@infradead.org>", "MIME-Version": "1.0", "X-BeenThere": "linux-mtd@lists.infradead.org", "X-Mailman-Version": "2.1.34", "Precedence": "list", "List-Id": "Linux MTD discussion mailing list <linux-mtd.lists.infradead.org>", "List-Unsubscribe": "<http://lists.infradead.org/mailman/options/linux-mtd>,\n <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe>", "List-Archive": "<http://lists.infradead.org/pipermail/linux-mtd/>", "List-Post": "<mailto:linux-mtd@lists.infradead.org>", "List-Help": "<mailto:linux-mtd-request@lists.infradead.org?subject=help>", "List-Subscribe": "<http://lists.infradead.org/mailman/listinfo/linux-mtd>,\n <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "\"linux-mtd\" <linux-mtd-bounces@lists.infradead.org>", "Errors-To": "linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org" }, "content": "Both callers now have a folio, so pass it in. This function contains\nseveral assumptions that folios are not large.\n\nSigned-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>\nReviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>\n---\n fs/ubifs/file.c | 41 +++++++++++++++++++++--------------------\n 1 file changed, 21 insertions(+), 20 deletions(-)", "diff": "diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c\nindex 11bf9f8cca6c..a1f46919934c 100644\n--- a/fs/ubifs/file.c\n+++ b/fs/ubifs/file.c\n@@ -590,35 +590,35 @@ static int ubifs_write_end(struct file *file, struct address_space *mapping,\n /**\n * populate_page - copy data nodes into a page for bulk-read.\n * @c: UBIFS file-system description object\n- * @page: page\n+ * @folio: folio\n * @bu: bulk-read information\n * @n: next zbranch slot\n *\n * Returns: %0 on success and a negative error code on failure.\n */\n-static int populate_page(struct ubifs_info *c, struct page *page,\n+static int populate_page(struct ubifs_info *c, struct folio *folio,\n \t\t\t struct bu_info *bu, int *n)\n {\n \tint i = 0, nn = *n, offs = bu->zbranch[0].offs, hole = 0, read = 0;\n-\tstruct inode *inode = page->mapping->host;\n+\tstruct inode *inode = folio->mapping->host;\n \tloff_t i_size = i_size_read(inode);\n \tunsigned int page_block;\n \tvoid *addr, *zaddr;\n \tpgoff_t end_index;\n \n \tdbg_gen(\"ino %lu, pg %lu, i_size %lld, flags %#lx\",\n-\t\tinode->i_ino, page->index, i_size, page->flags);\n+\t\tinode->i_ino, folio->index, i_size, folio->flags);\n \n-\taddr = zaddr = kmap(page);\n+\taddr = zaddr = kmap_local_folio(folio, 0);\n \n \tend_index = (i_size - 1) >> PAGE_SHIFT;\n-\tif (!i_size || page->index > end_index) {\n+\tif (!i_size || folio->index > end_index) {\n \t\thole = 1;\n-\t\tmemset(addr, 0, PAGE_SIZE);\n+\t\taddr = folio_zero_tail(folio, 0, addr);\n \t\tgoto out_hole;\n \t}\n \n-\tpage_block = page->index << UBIFS_BLOCKS_PER_PAGE_SHIFT;\n+\tpage_block = folio->index << UBIFS_BLOCKS_PER_PAGE_SHIFT;\n \twhile (1) {\n \t\tint err, len, out_len, dlen;\n \n@@ -667,9 +667,13 @@ static int populate_page(struct ubifs_info *c, struct page *page,\n \t\t\tbreak;\n \t\taddr += UBIFS_BLOCK_SIZE;\n \t\tpage_block += 1;\n+\t\tif (folio_test_highmem(folio) && (offset_in_page(addr) == 0)) {\n+\t\t\tkunmap_local(addr - UBIFS_BLOCK_SIZE);\n+\t\t\taddr = kmap_local_folio(folio, i * UBIFS_BLOCK_SIZE);\n+\t\t}\n \t}\n \n-\tif (end_index == page->index) {\n+\tif (end_index == folio->index) {\n \t\tint len = i_size & (PAGE_SIZE - 1);\n \n \t\tif (len && len < read)\n@@ -678,22 +682,19 @@ static int populate_page(struct ubifs_info *c, struct page *page,\n \n out_hole:\n \tif (hole) {\n-\t\tSetPageChecked(page);\n+\t\tfolio_set_checked(folio);\n \t\tdbg_gen(\"hole\");\n \t}\n \n-\tSetPageUptodate(page);\n-\tClearPageError(page);\n-\tflush_dcache_page(page);\n-\tkunmap(page);\n+\tfolio_mark_uptodate(folio);\n+\tflush_dcache_folio(folio);\n+\tkunmap_local(addr);\n \t*n = nn;\n \treturn 0;\n \n out_err:\n-\tClearPageUptodate(page);\n-\tSetPageError(page);\n-\tflush_dcache_page(page);\n-\tkunmap(page);\n+\tflush_dcache_folio(folio);\n+\tkunmap_local(addr);\n \tubifs_err(c, \"bad data node (block %u, inode %lu)\",\n \t\t page_block, inode->i_ino);\n \treturn -EINVAL;\n@@ -761,7 +762,7 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct bu_info *bu,\n \t\t\tgoto out_warn;\n \t}\n \n-\terr = populate_page(c, &folio1->page, bu, &n);\n+\terr = populate_page(c, folio1, bu, &n);\n \tif (err)\n \t\tgoto out_warn;\n \n@@ -785,7 +786,7 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct bu_info *bu,\n \t\tif (IS_ERR(folio))\n \t\t\tbreak;\n \t\tif (!folio_test_uptodate(folio))\n-\t\t\terr = populate_page(c, &folio->page, bu, &n);\n+\t\t\terr = populate_page(c, folio, bu, &n);\n \t\tfolio_unlock(folio);\n \t\tfolio_put(folio);\n \t\tif (err)\n", "prefixes": [ "v2", "15/15" ] }