From patchwork Wed May 1 16:06:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10925261 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6692092A for ; Wed, 1 May 2019 16:07:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 566D128E44 for ; Wed, 1 May 2019 16:07:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4AD4728E4A; Wed, 1 May 2019 16:07:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E71C128E44 for ; Wed, 1 May 2019 16:07:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 122DB6B0005; Wed, 1 May 2019 12:07:21 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0D31F6B0006; Wed, 1 May 2019 12:07:21 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB45C6B0008; Wed, 1 May 2019 12:07:20 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id AD1706B0006 for ; Wed, 1 May 2019 12:07:20 -0400 (EDT) Received: by mail-pf1-f200.google.com with SMTP id s26so11210780pfm.18 for ; Wed, 01 May 2019 09:07:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lmTrIGpEbI3KMOEYpjM6/I8DyJIPcU5OW04RpHaMmk4=; b=nYSM39oZ74GAttpDU3HMAgjfMjwjohH3zzchccaamUYE+Ky/IeYLlnWSsgYxCcu/CF nN0FM9AS1iURW7qG5qGgeN8Vhty7PPKw+bEKsositcodsdY35cLXGF5AXPh+bikI57MW rE5bkUoQrLNpxNMkC/SIKg8+MRwfNO0Of8a7oUcgba1+dh1IDHZz7EkS+av4jFhIEyPC LCmYkgQc1ePchcgRlHJBnxAecu4jB55ixhli4sKGf1Q/zZgFDQIN1WgQVQhsTczOGkfi CU1J56VJcDXhgcrCuAffWKucDkhi4JqKRT06id0oaJAc7VQd2szciSIiKomMfMCp29Js yC7w== X-Gm-Message-State: APjAAAXfow6pAkAebEJSTsGwYMrsRLhDB059m+o+U7jkiEWTDxdXMdyi oKcWNq/fWU15w8HnetHoOQH7UIohV96inS4reyyVnu66z64Jarpg/cBUiVu5Wif8iVyZlIeViZ4 5T/L8Jg5Y8ekzUqfh+NdJeXEKvegDIPoYqlBrCNjYSzD4KI0XrYuCu+0u6+O8ynU= X-Received: by 2002:a65:64da:: with SMTP id t26mr38481044pgv.322.1556726840310; Wed, 01 May 2019 09:07:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKyfgRoI5/t3vq/WLgY336PGz6Toi44VAFpFPLsiuVNW8wq2Z54y2gKODMmFAX0GjBjfl4 X-Received: by 2002:a65:64da:: with SMTP id t26mr38480933pgv.322.1556726838860; Wed, 01 May 2019 09:07:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556726838; cv=none; d=google.com; s=arc-20160816; b=ExTHIBxiEHVNXw2wpjRtkzkLtWvrkRBQQabi9Py/Hqfy+GXAeX2+l7KWVSVchf3IxS c/PTDr3gGGj60MgrfxX2Y3Ocg92Bmm33nSF19m2SxxQWPWVdac08BtgdckkaCRnJReGx 09bseBxZq8kChElC/3pyEgxd+xAwiM/jAYTGXLtIm1OXpltnwsAXA0gP3HSIFMKt7D7N lBC59QRhthbPYl8N8vZQGfsNV7TGEn+C2bBZpQzYmhjSnm8tiggym1q5ooZshTfsm/zs //yggpVat2cY+7Eu2xR4GMXQtKHsgTKhKG511hDA9Lhzm45oou/TdbaK4Qdxs242JxPQ /ypw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=lmTrIGpEbI3KMOEYpjM6/I8DyJIPcU5OW04RpHaMmk4=; b=bkTlNMSAUiPZtOrl9pCK1dplB/9E11Wb0/rF72ufvb9ux/UQ0ZNsRoAex4gNBhkYXx Wv0gwLWwG3E2Jhcv5qHPCZeVB5ohw8zY7NaBmB6RE7kqPKe5AY+2qygo2UZckpg+rMSM 7H5kkcR7pOOUs8GyNebtcxUtV4VAzN7XbYM4G90RWbhwdtQ1FztXkgmPInN7QjwkrBFg 2f3mvvQpxVdo/Tv85EyGEpFaHApoVQDihGfjFYoRrbGOZKoHgSXcsAPG57uIp9bTJLAv 25FAchzhXAOd2FAufap2IJrLAEfLV+LH7ukOfc9Zwf4mWIferco42UNBN4L9QqOskopt ltzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=Mjceeoxu; spf=pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id 34si33198242pgt.306.2019.05.01.09.07.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 May 2019 09:07:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=Mjceeoxu; spf=pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=lmTrIGpEbI3KMOEYpjM6/I8DyJIPcU5OW04RpHaMmk4=; b=MjceeoxumN84/e65UHYopkW3J5 jbvdYbAu8j9CHPZfKzzFkJledp6gzX7UHAiSE2A1+0tOKgHOswlNOFYbe0kDzPsqLWFAsqHV8cNrr DZYb9sdK9qv9jOtfbU0kNMyP2h1odMGgHBqJs6/Hn8xUovLq3lAaypCDyTIVcTzBwLLrwY2M1B1P0 tLI0BH7VQbm6FqOam7aePFfeJ2wuzPemXEZlU6HD8vV9Mf8+/QGyqeMYEg5zQ4trcRqAtzgZx+A4B WyjQ6Mecd3IE0LLrFjtwzmEbpo1lQ5ikOYpupyuNZZ+JvnMO4l/qWjwTEpKCJvFnqiiIzt6qKxoj4 u3NrNhag==; Received: from adsl-173-228-226-134.prtc.net ([173.228.226.134] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1hLrlL-0008Kv-Eh; Wed, 01 May 2019 16:07:15 +0000 From: Christoph Hellwig To: Andrew Morton Cc: Sami Tolvanen , Kees Cook , Nick Desaulniers , linux-mtd@lists.infradead.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] mm: fix an overly long line in read_cache_page Date: Wed, 1 May 2019 12:06:33 -0400 Message-Id: <20190501160636.30841-2-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190501160636.30841-1-hch@lst.de> References: <20190501160636.30841-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Christoph Hellwig --- mm/filemap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/filemap.c b/mm/filemap.c index d78f577baef2..a2fc59f56f50 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2956,7 +2956,8 @@ struct page *read_cache_page(struct address_space *mapping, int (*filler)(void *, struct page *), void *data) { - return do_read_cache_page(mapping, index, filler, data, mapping_gfp_mask(mapping)); + return do_read_cache_page(mapping, index, filler, data, + mapping_gfp_mask(mapping)); } EXPORT_SYMBOL(read_cache_page); From patchwork Wed May 1 16:06:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10925263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9685292A for ; Wed, 1 May 2019 16:07:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8789A28E44 for ; Wed, 1 May 2019 16:07:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BE6028E4A; Wed, 1 May 2019 16:07:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18C6528E44 for ; Wed, 1 May 2019 16:07:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7652D6B0006; Wed, 1 May 2019 12:07:22 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6C9B76B0008; Wed, 1 May 2019 12:07:22 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 518DE6B000A; Wed, 1 May 2019 12:07:22 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by kanga.kvack.org (Postfix) with ESMTP id 1AE1C6B0006 for ; Wed, 1 May 2019 12:07:22 -0400 (EDT) Received: by mail-pl1-f197.google.com with SMTP id p11so9092562plr.3 for ; Wed, 01 May 2019 09:07:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AzdtBbFHCjWd7P3mgIv4y6C+GQMKPuM0dPoXcWBi+4k=; b=E/ZsC0ZNGcjsrmFkgdAhZVhsW5rfTSYp6bHxQAcF/90j1p4W0GWwHfE1wzROeOhje5 ouHYXglay9VpK69SiyDsMe7RaFmvInmkLSYlCYmHdovYX8Iq1ssiF6iS4VuLiPezbsCg /uRiG5Tx84ifisFKZqtBwE5qumc6sB9uX3n016h4iGQO+9OEgqc7+3avcRajLr0OBwUS vUZDrQKYjDhLD8exTJ1r0bwWGAYxtUM43nkbyOiRMFL4vMaxxELWVCeTF49Rla6TPswP PWqzz1ff8qMoQJgPXUbTG5VJHJq3Qo2b0/YxT9vUZsuoLGTz3HfJJM5Z76ypDFgyEcKd qw/g== X-Gm-Message-State: APjAAAUpZn0/uBh1Qy20z0+KMJneJo6bLNos21zRO9/IVg5pjRqo0T83 yNXTA3+FlEcPpYcPSr6SnlrjI9G4n4MTTqim41SNDiUz6O/J2txxjsHG6uEdCsLyVQ2rNrWN4Cw AHntJOKb5A5FK/khOfTozRzlzfqcAHZqizXOObTJluPdzusQt/NSzyOWQisyRLw4= X-Received: by 2002:a63:243:: with SMTP id 64mr74108342pgc.214.1556726841703; Wed, 01 May 2019 09:07:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqz9crpvwTMua56shP0ByrjoUEctN41Sb09qh1VCqkCO7qsEb4dXnEg+r1EUAYs0s1Rl16g9 X-Received: by 2002:a63:243:: with SMTP id 64mr74108277pgc.214.1556726840816; Wed, 01 May 2019 09:07:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556726840; cv=none; d=google.com; s=arc-20160816; b=rrqCfmLbQ1N8biTWnZOsktY7zw5wb/yaVyWoWgShCIarjjzg5GgmTLSuRhLyeViQP3 ts7Onb2ukOXCGt914N2pywGoVcxujcsLbSkOZqPfvPmqGhdaIM3tngyJuRSZWyIt0FnG 8QgvwibNqhapipIqwX/7/z2NAIWXDOmkkWZUL/6/mi/PxAPA4DrEazn8wRDO3NZJ8nBi FFTPhEJ6xZM1x03UIClCqdLh1p9q1f22gsjVF20TkmlaDN8OHMQE4W3kiAdivRqDe8Dw Ks2NJby6/1tgWusUcpR4H+VbWIcKePM6Sg9Pie9QAU8n/yyxOn3pNgGspM2rfhamvDfh t8Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=AzdtBbFHCjWd7P3mgIv4y6C+GQMKPuM0dPoXcWBi+4k=; b=i8bhSxkLalE4uTJL26ISvOmyqqE+ppALDx3NeqFG9SCZAbuDgfU+ijRuipVeJNjmfh 4/jVGM580y9kACWUQdmMs7ekIx97AGvIsVamxqFvwJIwzDiZXHwGq8rkIRGIPAig+dD7 jtKGwAwaM+l7+IWpT6DGtoB370Cx8vH7+K4XDvWCC+uy1v2b4xu4y5MRvxm6NVMhx3SC f0zbnp1ipBL1YbzAKXgcG3zkCTY926yl0I3rcM4Izft/0grPeugnxNNR/DaxiE8PKHBc PwgzONzyfYG7aao0+T/rfxQtRkgjx9EYSqFhHpIJlkf1ZUdFddqEx3f/2PM/DgeYiHMh BZ+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b="Zc62yhd/"; spf=pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id l3si38741841pgj.136.2019.05.01.09.07.20 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 May 2019 09:07:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b="Zc62yhd/"; spf=pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=AzdtBbFHCjWd7P3mgIv4y6C+GQMKPuM0dPoXcWBi+4k=; b=Zc62yhd/KNhOnoD4Oz0HVxIUGJ ECU+tSIb3iXx8Z3M+eD4di90/kAmhkssjjPMj9GHJP4XjlmteyGVje11Wn7gL/JwVChII6z7AowcK MthBbZ+89ENfqzGjZbWywKtyYxVuDh+sfFWmuPgZW+uc5LZni8tEJPG3n7q4xTtM25jG6BG9j0k6c fmpWrrX5SIoI0bzLo8wI/GNU6Upekohnlk8P2MBJZW7MCPOzlCInSikzRv1NXhI+8NHPXFRYwEte3 G1cuS7x/BJjBWjSfd7c+o/BL0+efM51xjYubSnmdNSaSB7mHr1BRIFXx0g6OQXDnyjUu37GscR0qu ZnWid9CA==; Received: from adsl-173-228-226-134.prtc.net ([173.228.226.134] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1hLrlM-0008L9-Sy; Wed, 01 May 2019 16:07:17 +0000 From: Christoph Hellwig To: Andrew Morton Cc: Sami Tolvanen , Kees Cook , Nick Desaulniers , linux-mtd@lists.infradead.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] mm: don't cast ->readpage to filler_t for do_read_cache_page Date: Wed, 1 May 2019 12:06:34 -0400 Message-Id: <20190501160636.30841-3-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190501160636.30841-1-hch@lst.de> References: <20190501160636.30841-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP We can just pass a NULL filler and do the right thing inside of do_read_cache_page based on the NULL parameter. Signed-off-by: Christoph Hellwig --- include/linux/pagemap.h | 3 +-- mm/filemap.c | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index bcf909d0de5f..f52c3a2074cd 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -386,8 +386,7 @@ extern int read_cache_pages(struct address_space *mapping, static inline struct page *read_mapping_page(struct address_space *mapping, pgoff_t index, void *data) { - filler_t *filler = (filler_t *)mapping->a_ops->readpage; - return read_cache_page(mapping, index, filler, data); + return read_cache_page(mapping, index, NULL, data); } /* diff --git a/mm/filemap.c b/mm/filemap.c index a2fc59f56f50..51f5b02c299a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2866,7 +2866,11 @@ static struct page *do_read_cache_page(struct address_space *mapping, } filler: - err = filler(data, page); + if (filler) + err = filler(data, page); + else + err = mapping->a_ops->readpage(data, page); + if (err < 0) { put_page(page); return ERR_PTR(err); @@ -2978,9 +2982,7 @@ struct page *read_cache_page_gfp(struct address_space *mapping, pgoff_t index, gfp_t gfp) { - filler_t *filler = (filler_t *)mapping->a_ops->readpage; - - return do_read_cache_page(mapping, index, filler, NULL, gfp); + return do_read_cache_page(mapping, index, NULL, NULL, gfp); } EXPORT_SYMBOL(read_cache_page_gfp); From patchwork Wed May 1 16:06:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10925267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DDB617DF for ; Wed, 1 May 2019 16:07:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AAE528E44 for ; Wed, 1 May 2019 16:07:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E93A28E4A; Wed, 1 May 2019 16:07:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F30F428E44 for ; Wed, 1 May 2019 16:07:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 803FC6B0008; Wed, 1 May 2019 12:07:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 715E46B000A; Wed, 1 May 2019 12:07:23 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 569BD6B000C; Wed, 1 May 2019 12:07:23 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by kanga.kvack.org (Postfix) with ESMTP id 1D17C6B0008 for ; Wed, 1 May 2019 12:07:23 -0400 (EDT) Received: by mail-pl1-f197.google.com with SMTP id w9so9042326plz.11 for ; Wed, 01 May 2019 09:07:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UkZuaD7Mm6HPsygbDYfM+bk4xZlXKq4hzNRQaTP1dh0=; b=Wl51JDqEzf9v2T/McATqzvSrrUbQaqr7H5QrcgyJn09axuK8slTtUlfsEz5zyxEpTd PLxMIf7gSFzWp51H7MaPtTXkYt3gq40Bp0IxiN7qIYzjKVwkNueGKkvaUeNl5X98CAhm VXwduztbl5UfC+snnQu5XT6b648s7TjY4bpm5PnFmL9eBAQHoYmdqSBXMds5zFD74s9G x8GrzeaHMT9C2FNhKHV7A3JupefIHpTj8YcCiIk6EguC3B67UBAT5voA3usOefA940uE LhfConJEm5YFQih46NpLn9HMtZV1FMnk8KdZuSUdNc5f0g9mD/wZAH0Jezwk4pxHtChI 7X7Q== X-Gm-Message-State: APjAAAVcHPjlw7qoXKbsx6I+YSwFhraoiJA16X296yxt60HT+dVnuMDN pLVQA2ue/Z8+/yC77BHtloZ/NRJN1pH8nexrYUw8w0Xus1QACILw+cBrhdmu4/klzDSSwkxWGSj QQ04TSrVxgcdUpzm8NS89kwK7vMK9KTljmUWofmB3+3JwLMzP434/H/nkf7KbkJw= X-Received: by 2002:aa7:8054:: with SMTP id y20mr6540870pfm.108.1556726842761; Wed, 01 May 2019 09:07:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqzc4gmMzcD5TYOGOufDUsvhzwVtPiNtO0cjicKgMhI/2D2zhJl3tD/3x3VZvubSvPHqZ0xG X-Received: by 2002:aa7:8054:: with SMTP id y20mr6540808pfm.108.1556726841965; Wed, 01 May 2019 09:07:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556726841; cv=none; d=google.com; s=arc-20160816; b=pVyVpX7RVZ8wiQf4HFmHHAXjCSrvEhbMBaSXnGaBwD9waH+0rBBZOosi+FPTnpPwrY O5purhBAUWDNACcyNd5xh4Jn+kR9xv+PQ7N2Y/Whtlo/fYdUivYmsjx6rQBFVS1PRUn3 9jx8JiRAj6Vi8d28P2xJwwUHzzQSa4T1yEmpTcGUuHgqR3s6kvYpnbm1u97zpQbYlBQD 74KRroTBdOlQUPxO8fFU2Dgzq3MHwOV8/FBzskMmBBBIDit0XwxMzxAYZ8VWLjwelRDL 3/oChXVthQ7rt7dm0sBN8B2EPV8f2kLxQg/9BZ3Vr1L00RgZIlS9moO0JfwsnByu1OVA 6nbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=UkZuaD7Mm6HPsygbDYfM+bk4xZlXKq4hzNRQaTP1dh0=; b=FyvItGW8hhXN2IkCUXd1e0QyI/4/cNQ2XEwyc6+6+iG+VoQcvPvVUUKfBSByej52Sl Kej2RwRbBbYEdfnbPeGgrDezUpshJhLnahT9NEF6823iInPQdCMVLHUR8a8Vl0rMKi1V rhwO+S555qCXa5Z8HfIcCjOvb204NuO9KSVoRQBx5cCAMswZgmoqyMT0Kso0rPrU6NQT zNBdpKFlJtNHKoY4gNdHUmqVaFKUDTyi1yUpfQsoZT28n0kRzv/6FTNJTRdCt+DpK5Qx VXn0ubsGoOQ4uYjlfnq9iDXED01CjlKlQ6OQx26SddSG20/B8IWf7OyNodn/rFUkR2P0 Jfjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=BOHFVQkA; spf=pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id 5si12332646plt.198.2019.05.01.09.07.21 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 May 2019 09:07:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=BOHFVQkA; spf=pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=UkZuaD7Mm6HPsygbDYfM+bk4xZlXKq4hzNRQaTP1dh0=; b=BOHFVQkAG46eDJBYOpbwz2YPVY XQWZ6xnJ52th5oNnDhX56QOGmvBs2NJ18NLF+KQDVDgs3rolaHP4MR5TdjtPjR+JJdljMUmO9UBaN UB/BV55owFyHcMrd5/ND3t+hPSjcs6OAZhKGjGwewGeE/O+lTOnRqmy3RFwzppAdYHQ2H+DXywuMm zig7Ko9GH/87I/mhU7tKmPn98Lbrvo4gmTE4TZBR5yIECXjXWshC9BB1zcDlKjfv/kFxH1sAQ8ZXc Tr+c9N6Y6GLUZDRBdPrBPPRdRYpbwZ5VwuKftQ0dJWhnuBZEUCuf0ozkuIswyhHll3ggTqxOobjBe BBQuKPvg==; Received: from adsl-173-228-226-134.prtc.net ([173.228.226.134] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1hLrlO-0008Mh-Dh; Wed, 01 May 2019 16:07:18 +0000 From: Christoph Hellwig To: Andrew Morton Cc: Sami Tolvanen , Kees Cook , Nick Desaulniers , linux-mtd@lists.infradead.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] nfs: pass the correct prototype to read_cache_page Date: Wed, 1 May 2019 12:06:35 -0400 Message-Id: <20190501160636.30841-4-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190501160636.30841-1-hch@lst.de> References: <20190501160636.30841-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Fix the callbacks NFS passes to read_cache_page to actually have the proper type expected. Casting around function pointers can easily hide typing bugs, and defeats control flow protection. Signed-off-by: Christoph Hellwig --- fs/nfs/dir.c | 7 ++++--- fs/nfs/symlink.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index a71d0b42d160..47d445bec8c9 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -714,8 +714,9 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, * We only need to convert from xdr once so future lookups are much simpler */ static -int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page* page) +int nfs_readdir_filler(void *data, struct page* page) { + nfs_readdir_descriptor_t *desc = data; struct inode *inode = file_inode(desc->file); int ret; @@ -762,8 +763,8 @@ void cache_page_release(nfs_readdir_descriptor_t *desc) static struct page *get_cache_page(nfs_readdir_descriptor_t *desc) { - return read_cache_page(desc->file->f_mapping, - desc->page_index, (filler_t *)nfs_readdir_filler, desc); + return read_cache_page(desc->file->f_mapping, desc->page_index, + nfs_readdir_filler, desc); } /* diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c index 06eb44b47885..25ba299fdac2 100644 --- a/fs/nfs/symlink.c +++ b/fs/nfs/symlink.c @@ -26,8 +26,9 @@ * and straight-forward than readdir caching. */ -static int nfs_symlink_filler(struct inode *inode, struct page *page) +static int nfs_symlink_filler(void *data, struct page *page) { + struct inode *inode = data; int error; error = NFS_PROTO(inode)->readlink(inode, page, 0, PAGE_SIZE); @@ -65,8 +66,8 @@ static const char *nfs_get_link(struct dentry *dentry, err = ERR_PTR(nfs_revalidate_mapping(inode, inode->i_mapping)); if (err) return err; - page = read_cache_page(&inode->i_data, 0, - (filler_t *)nfs_symlink_filler, inode); + page = read_cache_page(&inode->i_data, 0, nfs_symlink_filler, + inode); if (IS_ERR(page)) return ERR_CAST(page); } From patchwork Wed May 1 16:06:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10925269 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9B64E92A for ; Wed, 1 May 2019 16:07:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C61128E49 for ; Wed, 1 May 2019 16:07:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 805E328E59; Wed, 1 May 2019 16:07:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A9C328E49 for ; Wed, 1 May 2019 16:07:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20CC76B000A; Wed, 1 May 2019 12:07:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 199676B000C; Wed, 1 May 2019 12:07:26 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 03A8A6B000D; Wed, 1 May 2019 12:07:25 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id BEB926B000A for ; Wed, 1 May 2019 12:07:25 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id v9so11122334pgg.8 for ; Wed, 01 May 2019 09:07:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UYhsUC45x3BaFz65BgDHiQpOpAjMvMtZBCkBOB8hL5Q=; b=gm+JenaKlLcyUWuybqnAXejGpVtNWeXCOfRsTK2izoNIQf3OBVjaeGwZOOIUPA/byF FlscyizT9pVz2pfNNPtvfI1793AJpUJ03Jdz4Q9BbxVh1ywY5v36omWTBa5PHGhbwzeI bvLycyo7j4LEtsKTNhBwOEbdWJCwHF0fI4iKdHOJZEOx/eHnKAsvA+uI8fNqYvTmlcXq dA+H3TMnSaoZd4AAmH95G8XRi5a+sXfN+sp5UfKt8JhFmbYnQfFacweqWvWjcC2xnkTE eZcSQTQtxvL7L9DoDoUIz1hCGGaJihmkS4fCTrm+rqw3kVv9g1606L/0t0BdpU7EsGUM lvbA== X-Gm-Message-State: APjAAAWeNF/u2b8AK4GD9EYAscIJBvs3PgBs8PiH3V+Gp89E0psGHT/w Y/jS4wR9zdeVBGrrnIJF3H6eB2KRrwVdUM+/kcSSb5FCniXdL3sBYkbY9LWZsS0cG5ANU77hmAL fUlBbWUA5IiCvGXCPvRMFqLnPbfTpgG+uP/LvJ3d//fm0rcj4SeqeWRbOhmfTo8E= X-Received: by 2002:aa7:8b11:: with SMTP id f17mr12323404pfd.116.1556726845433; Wed, 01 May 2019 09:07:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqwgT/qcQf/nhSEP3+o7yEEyNmIsYLXo0T235WbJVvdoNRpSr3HgiKF3MZdf1uucip6my8zd X-Received: by 2002:aa7:8b11:: with SMTP id f17mr12323341pfd.116.1556726844694; Wed, 01 May 2019 09:07:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556726844; cv=none; d=google.com; s=arc-20160816; b=gdxLz+bck82aiFp9oY5S/7qFpVVKnZUFZNGRBrCmA4qoTi4sA8P2QRxgbOd2d4Loe+ ylE+YGaliA/z1pWLN768IgfV6L7IueHXxT3K9/j9vEXLA+YoldjeW4xNSE8e3Miigpi5 MVf3S5IAKhGdo9SHPNFIr3m7rKuIjkCDJ+uS6hh5K8IsPpMS8slwyEdjeBN6H3O+TDIx jPD1qop8xPo+p6bXqDwqTO0GLuNr8G1xnkc0rZR25nSDOFDMMq968OrS9NvbAjsfjL62 mpgVjxVW9H7JH9QxFKq2Y+Q/dSYIGVJ1WLFL8nyYeQCoxhvl1tfrbHNw1LdfF9xWD9QM Uhww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=UYhsUC45x3BaFz65BgDHiQpOpAjMvMtZBCkBOB8hL5Q=; b=0jvmgDddlHieP0sHcWfoIWpEsOqVT/VR83f/iR6LztHMnNBG3tz81YudrL6W/v+8xO iya64xwu83Sruh4kMqkjnAccOvgi9KaQjrCeiWgOjFCUJtMHguKQzLMyZlSnRPWa0SGQ 7KIlrXV+5K1Sk3hOT8WQ8w3phbewjUEgKJj+l2Tyc4N7oiBFCy2CP9NgYXY8ZqpgUa1g 6KWherSNwRCi+j2KWcJ0qa6E5IJrW2ttaegya9WTaH31NmPkLLW0l9uCcoa8x85YxuDB Zrp2Q9+lrG7lCauNB896S0udIu+J9vcfH8S0S6/xq4PcDTLdEKWkqlkyJzXw8W6Nm1Ry ENdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b="N9hkv1/K"; spf=pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id q2si45057286pfi.165.2019.05.01.09.07.24 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 May 2019 09:07:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b="N9hkv1/K"; spf=pass (google.com: best guess record for domain of batv+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+fbe6eae7536a933b5243+5729+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=UYhsUC45x3BaFz65BgDHiQpOpAjMvMtZBCkBOB8hL5Q=; b=N9hkv1/KxvUiY8l8aDh5EzrKDf aX39LFBLR0uVkQvhJLeEuPzxrJ0HtEIeY1e9ikhySWDweBLiPvDrdzTlg6Wi0QSSQyaH9yXwYdcov pBzp0wGVJgNK7NXNtPiDAUZ9JEhgdVCOcXx35OAT/umKz11Mt42tyvCSvcGByPL85Lm1hqWDO1jDB 3eWTieiEchWRQ2uYH/Y5x99PF4advsXL+oOmTaa4AVdjheR/oqOCWxx1j8RQR+gadGYSv+v5Gdcjt uilpaJBDPY/A3oCNijbOhKOerYmle8m2zgrUn4qQy2u/DTcJ71W+0FaQ0X2cTtzC+j/lhgvo5htPv w1zfZX8A==; Received: from adsl-173-228-226-134.prtc.net ([173.228.226.134] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1hLrlQ-0008P9-2K; Wed, 01 May 2019 16:07:20 +0000 From: Christoph Hellwig To: Andrew Morton Cc: Sami Tolvanen , Kees Cook , Nick Desaulniers , linux-mtd@lists.infradead.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] jffs2: pass the correct prototype to read_cache_page Date: Wed, 1 May 2019 12:06:36 -0400 Message-Id: <20190501160636.30841-5-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190501160636.30841-1-hch@lst.de> References: <20190501160636.30841-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Fix the callback jffs2 passes to read_cache_page to actually have the proper type expected. Casting around function pointers can easily hide typing bugs, and defeats control flow protection. Signed-off-by: Christoph Hellwig --- fs/jffs2/file.c | 4 ++-- fs/jffs2/fs.c | 2 +- fs/jffs2/os-linux.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index 7d8654a1472e..f8fb89b10227 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c @@ -109,9 +109,9 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg) return ret; } -int jffs2_do_readpage_unlock(struct inode *inode, struct page *pg) +int jffs2_do_readpage_unlock(void *data, struct page *pg) { - int ret = jffs2_do_readpage_nolock(inode, pg); + int ret = jffs2_do_readpage_nolock(data, pg); unlock_page(pg); return ret; } diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index eab04eca95a3..7fbe8a7843b9 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c @@ -686,7 +686,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c, struct page *pg; pg = read_cache_page(inode->i_mapping, offset >> PAGE_SHIFT, - (void *)jffs2_do_readpage_unlock, inode); + jffs2_do_readpage_unlock, inode); if (IS_ERR(pg)) return (void *)pg; diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h index a2dbbb3f4c74..bd3d5f0ddc34 100644 --- a/fs/jffs2/os-linux.h +++ b/fs/jffs2/os-linux.h @@ -155,7 +155,7 @@ extern const struct file_operations jffs2_file_operations; extern const struct inode_operations jffs2_file_inode_operations; extern const struct address_space_operations jffs2_file_address_operations; int jffs2_fsync(struct file *, loff_t, loff_t, int); -int jffs2_do_readpage_unlock (struct inode *inode, struct page *pg); +int jffs2_do_readpage_unlock(void *data, struct page *pg); /* ioctl.c */ long jffs2_ioctl(struct file *, unsigned int, unsigned long); From patchwork Wed May 1 17:34:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10925415 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 154FA14B6 for ; Wed, 1 May 2019 17:35:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05E3E28751 for ; Wed, 1 May 2019 17:35:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDBF9287E6; Wed, 1 May 2019 17:35:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A449028751 for ; Wed, 1 May 2019 17:35:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A7236B0005; Wed, 1 May 2019 13:35:02 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 12EE76B0006; Wed, 1 May 2019 13:35:02 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EEEE16B0007; Wed, 1 May 2019 13:35:01 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by kanga.kvack.org (Postfix) with ESMTP id AE7A36B0005 for ; Wed, 1 May 2019 13:35:01 -0400 (EDT) Received: by mail-wr1-f72.google.com with SMTP id q16so18524603wrr.22 for ; Wed, 01 May 2019 10:35:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:date:from:to :cc:subject:message-id:references:mime-version:content-disposition :in-reply-to:user-agent; bh=FYD0+O1saS54RtwokFj4HpWLfzD9N+ZLICLPr9lVc/c=; b=AdpBjGK0K3/KkuRpQmmlyec52wSNvgqK5bBAWEqAh9V6hTJ8DvOVZbNQow+r0xadX/ mM6XwlqriAAgzAjKmk1Lh09OKzTFvdShNKipjWEoR7WptMyjJmeZO2Ln2iLjcBt6wfOw 9xW0YC87gYcF/Y03+eviSAPR/WpUh8Gt3K3gW3acQBAJjW6weDyH1UQfZiZpNN6XNk3+ H0vei6jIVlgmmCGphybc6XsNP2DqEwzGAeQyWNAbudMgriV1HYpb5CA1es8B0cMfDxMf Vkmp8B0Kf5gZpqxtHq3Ps4Dr4Succ2RW68uWJqq0ikB122nV0yBFDTWwnbb6K2IsAfD3 ypJg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of hch@lst.de designates 213.95.11.211 as permitted sender) smtp.mailfrom=hch@lst.de X-Gm-Message-State: APjAAAUmKIhrjIiU0Vjb39eGZe/vEFXJll6PraebEeEf4qj2zddN1ium JDfB+0WTsiQweUAk3dGsmeIFMDX5PnTjtJ1/qofx+jRpajh9t/AuNsL/bhwTG/G4MjMY6skYNWr F6lPvV9H5I3Q6Zx+J8sdxeECD7jYs2Ut0bBV50U/WSe/Ki8eG9rQqwbhSIsw+lHomWg== X-Received: by 2002:a1c:7518:: with SMTP id o24mr7243098wmc.42.1556732100912; Wed, 01 May 2019 10:35:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqxUcrjWVaNcRErc+E/NuE6Botdk8EinKBkUNPJ0Pt5RBzLW8LqE2o0+8UB5gU6zKljuDrwD X-Received: by 2002:a1c:7518:: with SMTP id o24mr7243067wmc.42.1556732100012; Wed, 01 May 2019 10:35:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556732100; cv=none; d=google.com; s=arc-20160816; b=SMJ7WFFH6JFCi/8jEPvm6adD1LJ02jvqdD0Kib0/GJFWdHkyz4blNSJOdqSNmFAT8q qstgdlJWKUCnMvoAxPxc5ZzpOFoEPCNKKnQ1hRTwyOU/FKUwNeSPc2q+u5wiFYH3iiyv KT8YbWxbKIh1SbHylUea4Kq77xmvKNYNGytHOFW8bvk0dDxJb79OjWVGPKfQWl0OtWHA rvVijcg5220Hm4sPHJsNRrpGWFbtIGCXo4r7TCF7zotzUPRwYx2YBl/j7t5Kunubz8UR GR47dhwrBT9IIL+2KMc8vuaqN0M5r1NYeEUbOCQCOKS16p/S2MRUn1rfhND9KOb2CMAo kVbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date; bh=FYD0+O1saS54RtwokFj4HpWLfzD9N+ZLICLPr9lVc/c=; b=gW/kSUu1qhWr8ap3DBi6T3425vyhQ7ofInzCM5o4i9AdSycoM8OB2iWtj4HlpXnVq6 fuwTMYGyrXBJ48gsHnNtvQliANeAcTx9NtM+uezK8rgrsTtZp0ze8k25IvKsZJx/C9zS V3xBRfSXMo+RW477eCHMijRwdoaaXCY0jXMm0dylhIOtxllzhVj1qjM/2xPd5U5MQCBL EZgDOHbO/hnGaDgM9SAMlKd4ce5/NpH42uJFGGchrYiEjHUSa9CZPRFj/fEdG4ezGLS6 hrFnqE1byDmFFlml3EQF+H0GBkMvY+z9rOpttVVRraMuWSUPpFC6USDkIIUObB2Y9m+2 fQ9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of hch@lst.de designates 213.95.11.211 as permitted sender) smtp.mailfrom=hch@lst.de Received: from newverein.lst.de (verein.lst.de. [213.95.11.211]) by mx.google.com with ESMTPS id k11si3416614wmj.175.2019.05.01.10.34.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 May 2019 10:35:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of hch@lst.de designates 213.95.11.211 as permitted sender) client-ip=213.95.11.211; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of hch@lst.de designates 213.95.11.211 as permitted sender) smtp.mailfrom=hch@lst.de Received: by newverein.lst.de (Postfix, from userid 2407) id 5364068AFE; Wed, 1 May 2019 19:34:43 +0200 (CEST) Date: Wed, 1 May 2019 19:34:43 +0200 From: Christoph Hellwig To: Andrew Morton Cc: Sami Tolvanen , Kees Cook , Nick Desaulniers , linux-mtd@lists.infradead.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/4] 9p: pass the correct prototype to read_cache_page Message-ID: <20190501173443.GA19969@lst.de> References: <20190501160636.30841-1-hch@lst.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190501160636.30841-1-hch@lst.de> User-Agent: Mutt/1.5.17 (2007-11-01) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Fix the callback 9p passes to read_cache_page to actually have the proper type expected. Casting around function pointers can easily hide typing bugs, and defeats control flow protection. Signed-off-by: Christoph Hellwig Reviewed-by: William Kucharski --- fs/9p/vfs_addr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index 0bcbcc20f769..02e0fc51401e 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c @@ -50,8 +50,9 @@ * @page: structure to page * */ -static int v9fs_fid_readpage(struct p9_fid *fid, struct page *page) +static int v9fs_fid_readpage(void *data, struct page *page) { + struct p9_fid *fid = data; struct inode *inode = page->mapping->host; struct bio_vec bvec = {.bv_page = page, .bv_len = PAGE_SIZE}; struct iov_iter to; @@ -122,7 +123,8 @@ static int v9fs_vfs_readpages(struct file *filp, struct address_space *mapping, if (ret == 0) return ret; - ret = read_cache_pages(mapping, pages, (void *)v9fs_vfs_readpage, filp); + ret = read_cache_pages(mapping, pages, v9fs_fid_readpage, + filp->private_data); p9_debug(P9_DEBUG_VFS, " = %d\n", ret); return ret; }