From patchwork Thu May 10 14:41:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 911388 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="Pxf1o1Nh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40hbTs1n0dz9rxs for ; Fri, 11 May 2018 00:39:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965664AbeEJOjc (ORCPT ); Thu, 10 May 2018 10:39:32 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:43729 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935661AbeEJOjb (ORCPT ); Thu, 10 May 2018 10:39:31 -0400 Received: by mail-pl0-f67.google.com with SMTP id a39-v6so1420915pla.10; Thu, 10 May 2018 07:39:31 -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=r1LjxpNYfGGhWCImaVekkjNd9QYJDhrLHYkS4fNHaS4=; b=Pxf1o1NhwxdDVOb6u8BSO3Rq78LJUsBXCKxONgZvG/DBfy3cvVj4Di2aoNsbzSwG7W BYUroom2BKUTRZJzPCSxmrDmBfX2Krlpi5rHwBB40PCXpkyV2ADGRHqiHY9r+wGDarAz EerNASjerMZzankCmxIh3/jwmsqK2QeRl151h/JoIiKD+lBwdoIPWuA807QknbCVpccN bo8W5exuF5UxdV0NFa3a9qoUPiaMjA7AxIXVGg8s/A45HWZl49C1LsZaRHQZFHAwadj5 XusgcrN2FLf49fMc2P7qCWsIpdry37cmFg8EOzbE9WatHyfLwmJiz+SidKM+9I08hs/a ZkOw== 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=r1LjxpNYfGGhWCImaVekkjNd9QYJDhrLHYkS4fNHaS4=; b=HI2r+6KAJecPx814DJoEdryhEAXI785KK+OSgBCrt+196e6bDrFqcHwAok6oIB3+7g ePHV21zDUsn2fCpzGAEP5J+dKN/vg1sMewFuyfmvR6UNYRlOqoWju3ublh5FDFikjxoR /AufzIXZYt5gv1DoGq4bxoioRMtV2DFkS/2GTvMzhlO9hReNa0vvFaCRGJdC8K1eeS/b KeZ/yr5yMMcImazliD1ZhuCAPJlYQEJndPx5oxkqEko+MWL5DFbbMwHC/zLc/sv+F1yZ H4LlOKcoNT28ixbQyGbr+B671jkou+c0X7VYiLUx2CkMoeaKDtsoqlVGnJtoqTORqzab IULw== X-Gm-Message-State: ALKqPwf3mxgx79zRnbNf8QmaF1GvTdt7fe6Rk6jSPWF1szHXK7ckZngG +xR8uezKEv+iDN4GPx9VqN8= X-Google-Smtp-Source: AB8JxZpAjt2LPas3yffbaXzGdHRQkH87AvO8M1e6D7eGqxrz1+WDr3mfeOrB562wOXs4rx4v78YAgA== X-Received: by 2002:a17:902:b681:: with SMTP id c1-v6mr1644167pls.286.1525963170870; Thu, 10 May 2018 07:39:30 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([49.205.218.138]) by smtp.gmail.com with ESMTPSA id q62-v6sm3104724pfd.172.2018.05.10.07.39.28 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 May 2018 07:39:29 -0700 (PDT) Date: Thu, 10 May 2018 20:11:36 +0530 From: Souptick Joarder To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, willy@infradead.org Subject: [PATCH v2] fs: ext4: Adding new return type vm_fault_t Message-ID: <20180510144136.GA26160@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 handler. For now, this is just documenting that the function returns a VM_FAULT value rather than an errno. Once all instances are converted, vm_fault_t will become a distinct type. commit 1c8f422059ae ("mm: change return type to vm_fault_t") Signed-off-by: Souptick Joarder Reviewed-by: Matthew Wilcox --- v2: Updated the change log 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); }