From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751404AbdBBLg7 (ORCPT ); Thu, 2 Feb 2017 06:36:59 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:56982 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751237AbdBBLg5 (ORCPT ); Thu, 2 Feb 2017 06:36:57 -0500 From: Arnd Bergmann To: Andrew Morton Cc: Matthew Wilcox , Arnd Bergmann , "Theodore Ts'o" , Andreas Dilger , Jan Kara , Ross Zwisler , Dave Jiang , Miklos Szeredi , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ext4: fix up huge_fault rename Date: Thu, 2 Feb 2017 12:36:12 +0100 Message-Id: <20170202113625.702169-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:y1VG/cEOoQM9AwOkY96A6sAO19YO1zEbBm+eKpgFXBtQCi0bdmL IXmQ5deC49c609+oP9OJOQxdg1rXa17UKjR9zkFs4i9mlFjSGiZisGnSmgDn14S5c/kadtb f+PoynYuoafiAYg0Xd4pwPnQ+pw3tEgbZHdpoBOrpIMvD6BwGWq7SmvDKxnwujpgHfcr86o N9z/2KqX25Yue5TDbshoQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:HhjCwtT0nG4=:oZFnLYUZGLm1ayb99GBxD+ MnyCcXjQaH7mwkzY4owtcs2Mgp3JAa65RsWZbXaEYvoaTiM+rc/O6Cn+7oV88eejmETrMnx5O EeZad4B5tf2kRUZnXa/BSbYzurZ6i/ly5++UzOdO+w9r9mnwDdyU1pXvohKVRrao3D+Gwwu4m sdayEkhQ6zK8Mdgl1FWK5s5u29TAqyteSccnLZ+7vxfcgB9cGzza652n0IQ4gzHJ5B3IADci1 orZdu/YPyQfB1T1XkxZEwxb7E/TolDZP6B4yMbW+qJsyNJYZ1ikXtbJGpkBw7zDm+KHt56EwM GtwksDGZso3/E8+G0iqkdAxy7fIRVpCC/Um5fy9T2cMZX9w5RFGcXZWQRATHeRhnzq8y3lMvx OWeAGBt2XccNENvA5nIJLElkXWwkXVBTGbQ6zY8mDJeE5WAp2f56gu8y+nppvvIXTIST2L7FJ 7wGBcyWoEPnTV037SS7f+gm0DK3jejtVUw/lnM4NDfpou/Dg+3rQSHA4fQ/j9AGyOYYpNko6O /qQNBKATDdZyz8nNz950+WArI4cW7oRCjHBKnMKX38zI71mtV3p3cvuyZLCLiki1/QzEx6xFf UbmppCKQCVBfou924a07ltk99IDPNoOLbK/0vmdJj/rC+6m3fEFji2OIkXbnos8dfoj97qCJL LL2rS0wCSO33fR/Mi4e5kHbtH7mLOaSE58nCScj7iuroT1WhqRJEPl1z6At4/qe89HvY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It looks like a search+replace accidentally change one function pointer that should have remained as before, as shown by this new warning: fs/ext4/file.c:279:1: error: 'ext4_dax_huge_fault' defined but not used [-Werror=unused-function] This reverts the one line of the changeset. Fixes: 80a841811260 ("mm,fs,dax: change ->pmd_fault to ->huge_fault") Signed-off-by: Arnd Bergmann --- fs/ext4/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index ed22d20e843c..e1a581133aa1 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -329,7 +329,7 @@ static int ext4_dax_pfn_mkwrite(struct vm_fault *vmf) static const struct vm_operations_struct ext4_dax_vm_ops = { .fault = ext4_dax_fault, .huge_fault = ext4_dax_fault, - .page_mkwrite = ext4_dax_fault, + .page_mkwrite = ext4_dax_huge_fault, .pfn_mkwrite = ext4_dax_pfn_mkwrite, }; #else -- 2.9.0