From patchwork Sat Apr 14 19:35:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 898195 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ttGCNKaV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40NlFM1Cbgz9s0t for ; Sun, 15 Apr 2018 05:33:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751674AbeDNTd6 (ORCPT ); Sat, 14 Apr 2018 15:33:58 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:42917 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751590AbeDNTd5 (ORCPT ); Sat, 14 Apr 2018 15:33:57 -0400 Received: by mail-pl0-f67.google.com with SMTP id t20-v6so7862424ply.9 for ; Sat, 14 Apr 2018 12:33:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=qEkocZeuAvYBwHpqo2ZqXH+obTPhfK6MzL1hhRYEaMs=; b=ttGCNKaVzw4yzbh6BElJ9U4etb5m5T7/Ot0VzGkxpjwkFpRHA1DKmj6n3Jzow0awT2 Qj8USX9a/lO348CzD8OTeKYNlSOOlSfHdju2Yg2eveZuo09dI74yR0EIKTB/3Ep3XZCl U3ZS+m3uV5M/Pe/Tnr+6sUSaIaFq0FYR/clMICgNyRaZnFAsLIkh+V7YBxQBE2wfht0c iRAHqTMXviLCBAzHrpGMCw/dIf+TgFZNorQ9aqYoVioto8JbLigv9t9JQTNty8N6NJr/ LZoTsTeI9Qivybmtowv7Z6faQJ1vXzwJPd9bClWZii18ub3rnD8mIbsjkmh9GP1RNKv6 rf4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=qEkocZeuAvYBwHpqo2ZqXH+obTPhfK6MzL1hhRYEaMs=; b=krND3B3b1T3F3BTuunysGYfRDH1Vjn8ge0amFRb2YqdVRauM40Yikfv2/DGudDu1Nm b6G957W04LDleqSjZFJTifIGMAU616EOxlAfgNrMCZPPnzPaswzD6B7f3HXrLEsCQNh5 VSvRrvIEb95+E24aFGRQnOpwUTvlLnJzd50fcS2mZuxziE1LXJnhbRI3zRcvmVj2779/ iJPtmlQrmxk5CNQhgNIdtMN25Y20dhb3w0x2M4UFB9MLM1/cbzQ/7eDhtv53+tP6OErs 1Eb4X36S7XUBPnsH+Jy0i/unKDJ+GY9uGS8jLN6o/cMK8aRQU1x/p2XtJJWBac16UuCs ArFg== X-Gm-Message-State: ALQs6tCZQ3sLhkalwKq+gVhHih4mbbnItsnnkNLJAoGTSmgF4OKKbc9v rWte7QcHtVSH5FwBkf5629N3m98E X-Google-Smtp-Source: AIpwx4/6Jr3RvqIO4tYNzv3jXdXa0RtWIxaOfisMVzs1ODY/tgJ/sBB3uxTkVGpZFjtttOcDWk9stA== X-Received: by 2002:a17:902:7102:: with SMTP id a2-v6mr9552310pll.87.1523734437146; Sat, 14 Apr 2018 12:33:57 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([49.205.218.216]) by smtp.gmail.com with ESMTPSA id 81sm16312786pfl.92.2018.04.14.12.33.55 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 14 Apr 2018 12:33:55 -0700 (PDT) Date: Sun, 15 Apr 2018 01:05:49 +0530 From: Souptick Joarder To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, willy@infradead.org Subject: [PATCH] fs: ext4: Adding new return type vm_fault_t Message-ID: <20180414193549.GA19973@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Use new return type vm_fault_t for fault handlers. Signed-off-by: Souptick Joarder Reviewed-by: Matthew Wilcox --- fs/ext4/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index fb6f023..655d1c7 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -277,10 +277,11 @@ static ssize_t ext4_write_checks(struct kiocb *iocb, struct iov_iter *from) } #ifdef CONFIG_FS_DAX -static int ext4_dax_huge_fault(struct vm_fault *vmf, +static vm_fault_t ext4_dax_huge_fault(struct vm_fault *vmf, enum page_entry_size pe_size) { - int result, error = 0; + int error = 0; + vm_fault_t result; int retries = 0; handle_t *handle = NULL; struct inode *inode = file_inode(vmf->vma->vm_file); @@ -335,7 +336,7 @@ static int ext4_dax_huge_fault(struct vm_fault *vmf, return result; } -static int ext4_dax_fault(struct vm_fault *vmf) +static vm_fault_t ext4_dax_fault(struct vm_fault *vmf) { return ext4_dax_huge_fault(vmf, PE_SIZE_PTE); }