From patchwork Wed May 16 05:43:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10402693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 94FE7601D2 for ; Wed, 16 May 2018 05:45:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8529F28733 for ; Wed, 16 May 2018 05:45:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79EB028761; Wed, 16 May 2018 05:45:56 +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=-3.6 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) (using TLSv1.2 with cipher AES256-SHA256 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1981A28733 for ; Wed, 16 May 2018 05:45:55 +0000 (UTC) Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w4G5f5GC050467; Wed, 16 May 2018 05:45:06 GMT Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2120.oracle.com with ESMTP id 2hx29w34v7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 May 2018 05:45:06 +0000 Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w4G5j4K2010314 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 16 May 2018 05:45:04 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1fIpFI-0005b9-Ej; Tue, 15 May 2018 22:45:04 -0700 Received: from aserv0022.oracle.com ([141.146.126.234]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1fIpEb-0005XU-UY for ocfs2-devel@oss.oracle.com; Tue, 15 May 2018 22:44:21 -0700 Received: from userp2040.oracle.com (userp2040.oracle.com [156.151.31.90]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w4G5iKG5008298 (version=TLSv1/SSLv3 cipher=AES256-SHA256 bits=256 verify=FAIL) for ; Wed, 16 May 2018 05:44:21 GMT Received: from pps.filterd (userp2040.oracle.com [127.0.0.1]) by userp2040.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w4G5gekW007059 for ; Wed, 16 May 2018 05:44:20 GMT Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by userp2040.oracle.com with ESMTP id 2j0b2fkaa5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 16 May 2018 05:44:20 +0000 Received: from [93.83.86.253] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fIpED-0007zV-TC; Wed, 16 May 2018 05:43:58 +0000 From: Christoph Hellwig To: Souptick Joarder , Matthew Wilcox Date: Wed, 16 May 2018 07:43:36 +0200 Message-Id: <20180516054348.15950-3-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180516054348.15950-1-hch@lst.de> References: <20180516054348.15950-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-CLX-Shades: MLX X-CLX-Response: 1TFkXGRweEQpMehcYHBwRCllNF2dmchEKWUkXGnEaEBp3BhkeHnEYHRwTEBp 3BhgaBhoRClleF2NjeREKSUYXRVhLSUZPdVpYRU5fSV5DRUQZdU9LEQpDThdmXV9dB3IaWU1TE2 sbax1sEk5weB9nbXBOfVtgR0dnbBEKWFwXHwQaBBsZHgdIHkseSRJLTgUbGgQbGhoEHhIEGxAbH hofGhEKXlkXeWd9RHoRCk1cFxkeHxEKTFoXaG1CTV0RCk1OF2gRCkxGF2xraxEKQ1oXGxMSBBsZ HQQYGhgEGxkZEQpCXhcbEQpEXhcYEQpESRcbGREKQkYXbW0beEJTenhJWWwRCkJcFxoRCkJFF29 6T1xvZ3ocbBIeEQpCThdvHGxvQ1JPEm8THxEKQkwXbmVne0JyRlJrGhkRCkJsF2BnHWB6Yh5PRB NwEQpCQBdteklAQnJrHUhrGBEKQlgXYn1veQFPGBlwcHsRCnBoF2hwZGdScG95cE8dEBoRCnBoF 2ZHXWR4R1lETn9tEBoRCnBoF2tTeXB+Tx1wb2F5EBoRCnBoF29QRE9pTH4fHQFNEBoRCnBoF2Zp eGNke1gTH3xnEBoRCnBsF28BfkNbZ05vckhSEBIfEQpwQxd6G31/GxlLQH5HRxAZGhEKbX4XGhE KWE0XSxEg X-PDR: PASS X-Source-IP: 198.137.202.133 X-ServerName: bombadil.infradead.org X-Proofpoint-SPF-Result: None X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8894 signatures=668698 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=266 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=364 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=871 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1805160057 X-Spam: Clean Cc: linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, ocfs2-devel@oss.oracle.com, devel@lists.orangefs.org, linux-fsdevel@vger.kernel.org, linux-mtd@lists.infradead.org, ceph-devel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-btrfs@vger.kernel.org, lustre-devel@lists.lustre.org Subject: [Ocfs2-devel] [PATCH 02/14] fs: make the filemap_page_mkwrite prototype consistent X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8894 signatures=668698 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1805160057 X-Virus-Scanned: ClamAV using ClamSMTP !CONFIG_MMU version didn't agree with the rest of the kernel.. Signed-off-by: Christoph Hellwig --- mm/filemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/filemap.c b/mm/filemap.c index 52517f28e6f4..cf21ced98eff 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2748,7 +2748,7 @@ int generic_file_readonly_mmap(struct file *file, struct vm_area_struct *vma) return generic_file_mmap(file, vma); } #else -int filemap_page_mkwrite(struct vm_fault *vmf) +vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) { return -ENOSYS; }