From patchwork Sat Apr 14 19:33:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 898193 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="hwqqOCmX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40NlBy5lrGz9s15 for ; Sun, 15 Apr 2018 05:31:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686AbeDNTbv (ORCPT ); Sat, 14 Apr 2018 15:31:51 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:38813 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751630AbeDNTbu (ORCPT ); Sat, 14 Apr 2018 15:31:50 -0400 Received: by mail-pf0-f195.google.com with SMTP id y69so8631492pfb.5 for ; Sat, 14 Apr 2018 12:31:50 -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=VFEbWEMBKBaXCo3BOJCV673mPx8F79rHoEVKqUUTOxg=; b=hwqqOCmXj9UO+rmv0JxI4AS4T7yUkDyyd+PXGNl/MjjubqZYTGhQkNzdEZKL8umax3 0Qp49QYJOneFnzPEkWXeoFk+wgjGz6LXLrlXLJuOLOWdqAgDNZ8j0v29QlD9Byf6wjzG aU+ZQ9Fg4LQ46/UduVLjXDGfEGD1OokcycLH2nv3FCTWLirvfkxKUObructqc1IZ0l6R xId8nDvQAkZjbT4KLIwyY7gTQiwsqTAPAx3+LHbYJa68bpiTLyQrtHT5SPxU7hOPjcCR gJHyYFvT8ujQakjmSPdXZbnSfKU4MXIAzTLhuhH6790xk7yjFVel9eew9EUkQRh65/iP OIYQ== 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=VFEbWEMBKBaXCo3BOJCV673mPx8F79rHoEVKqUUTOxg=; b=cnmyv5BEdq0bNvkGalAuwH6kbqgZxObWKDAQio/Q48AL8tLpYff32MLvOGNfnd62nC Hl6JAS2cx/C1LUitrJ9/dFQ8GjVxic1HWXvTwclg9WXZ8c8zO4l1hPd2/dKZJD6cCtnK zUASsSikm+1eeb2GpvpteCTnxKL9AVzH969FvpoL8/sCFUu6Uj2J9g3IZzImzOCU98hc tfDBvge4LqcS/WP0g3xzHoztogl7dpS/9RFWh8jS5hFT4tngSuPr+GfxYlfWTCayZ6aT AVrHomWFxMmQqqcpC/LDic+IaBIg451ksyrwZX3ae9VyGasrSUXQE4yJslXTtIljN/q3 DLeg== X-Gm-Message-State: ALQs6tCpxsXASn4//hx4eyTgT9ZSMgT1Pw4JUpq10TA6bIwhbe5JEcl3 vsfjV1cpPiu2SPoo4rBJQu8= X-Google-Smtp-Source: AIpwx4/JCDxhMClcMgAIgVZhKufqV4DbOKOSuoxsJUnnKTEd9AY0Fvr/yGejg59iGOfBCHJF/hmSRA== X-Received: by 10.101.73.141 with SMTP id r13mr8090087pgs.426.1523734310221; Sat, 14 Apr 2018 12:31:50 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([49.205.218.216]) by smtp.gmail.com with ESMTPSA id m3sm4316680pff.150.2018.04.14.12.31.48 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 14 Apr 2018 12:31:49 -0700 (PDT) Date: Sun, 15 Apr 2018 01:03:42 +0530 From: Souptick Joarder To: jack@suse.com Cc: linux-ext4@vger.kernel.org, willy@infradead.org Subject: [PATCH] fs: ext2: Adding new return type vm_fault_t Message-ID: <20180414193342.GA19956@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 page_mkwrite, pfn_mkwrite and fault handler. Signed-off-by: Souptick Joarder Reviewed-by: Matthew Wilcox --- fs/ext2/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext2/file.c b/fs/ext2/file.c index 0964022..047c327 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -88,11 +88,11 @@ static ssize_t ext2_dax_write_iter(struct kiocb *iocb, struct iov_iter *from) * The default page_lock and i_size verification done by non-DAX fault paths * is sufficient because ext2 doesn't support hole punching. */ -static int ext2_dax_fault(struct vm_fault *vmf) +static vm_fault_t ext2_dax_fault(struct vm_fault *vmf) { struct inode *inode = file_inode(vmf->vma->vm_file); struct ext2_inode_info *ei = EXT2_I(inode); - int ret; + vm_fault_t ret; if (vmf->flags & FAULT_FLAG_WRITE) { sb_start_pagefault(inode->i_sb);