From patchwork Wed May 16 05:43:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10402657 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 50720601F9 for ; Wed, 16 May 2018 05:45:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 414D628733 for ; Wed, 16 May 2018 05:45:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3614928739; Wed, 16 May 2018 05:45:11 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A738E28762 for ; Wed, 16 May 2018 05:45:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC9AE6B02F8; Wed, 16 May 2018 01:45:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D27426B02F9; Wed, 16 May 2018 01:45:00 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BD3806B02FA; Wed, 16 May 2018 01:45:00 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 68C126B02F8 for ; Wed, 16 May 2018 01:45:00 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id b64-v6so1898655pfl.13 for ; Tue, 15 May 2018 22:45:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=HJIbFVL9Dcsydlgs2QtrsHEEM3Xyibuk+Bko5951718=; b=QuL3eBS/5dtEhCeinEz5HrgPm1dX1WnEJvCUoYcLGtrpX5jDNvAjaAk8JjT9yPu7Cd ossLcifB2txO6qFWkZdo8dO7B6VbaegdKT/Yc2cHFsrt6h2erTtx9FZTKhCzGGZZ+DfP Fpbiy/zGZd7s7V82Sp3tg/MwmQbdDvEv0VKYRN4ETvhDNjfDq1lcc2BepWeI25Zvp+ru +LEXrDwiGZVZOSh0bnZZWMTm2h2pnHSt7I7uaWLNFadG9RUfG/JdNPhgiFzmmiZ/oZrg XqzAeUqm5fCGa4vWSnJIo9kqXT9NIS/EK1iiPDBppkzM5eoQHVwxG08T0kzvep6wQNd2 766g== X-Gm-Message-State: ALKqPwetNI8JkQuE7QBNGtXp6kjvAxhxKnz8KA+C8xrp98KBoMVsCBnR R4xwO7vNw6k3wxeFvaaQlKJwxnbwxCqPwX4kdUN7Q0gaGx1NblI7Li71fW1t5T99IxRBgahuCKr lUCTnyjZSeCePiIsrvPqvuXGoie8xYQE84juWA1n1njuzdY5XDZXmzK2kJ2mzqvo= X-Received: by 2002:a63:7514:: with SMTP id q20-v6mr14661340pgc.127.1526449500078; Tue, 15 May 2018 22:45:00 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpZdBDZU3nUueBBKe0isgLAOqlAsuOwef1Gz2Q/7J+5j1aoUbbLUCX1yRKFYRBssIHdlmTh X-Received: by 2002:a63:7514:: with SMTP id q20-v6mr14661305pgc.127.1526449499321; Tue, 15 May 2018 22:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526449499; cv=none; d=google.com; s=arc-20160816; b=BhmuzeczpmJz3fC8wswa9A3c8Fq2kRI20Pr3dPnqlY1bCoFN8P+rzRDgxRbcGS42sI f+L5KEZfuP1LdsUkT0DOQD0QYzNDsMqzHKuNn9JLE+bZaIFhBONPGeGp8chMONnUWwJX f+yhSeMAGyg5/wgD+yfQL8QCOOunP1d2i+GNnqGeXET2XjViKMN/a76/nDYuX8sgUKhD 3pXs664y5DXauav6m/3kvIjUBUUW+Dfsyh4bI/qDmvzfESUP5Xl+/XTX2zH32R5KMsYu p4lJuy0bReURPJtFMF76IxFFaXO5W+zajzOpAJmLuLXhzflx+7I08V3nFMGL5bwT7mXK ju4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=HJIbFVL9Dcsydlgs2QtrsHEEM3Xyibuk+Bko5951718=; b=MhHiFX9UaGn6LqM241VTQ/vs0we1m8mRJ4as0w71/DJt92eIw5LfVYSDcl1FScsmu0 D/ih7JibzHuKr+rLGNmGka8rhh/jdekylbF0Mi/rPNvqgiz4OrPujH+aSpf96r+sH6Jy XUbE3yPeCWF/TPG8KbGMcZRfAcdP9qUCTD5sK33+U+67rijjWmo5TPrwdsHoOT1wOPYz cwQkz9laPKMCqfNNHhDkpclVdlwA3QkDs0UgJyBekyIpE2/QL5xCGGUFXa/meppjrDcy I8BtRr8GY/cQggm3lRmN0zCRt9fZ3V3rYcmqAt9XqvCDpUewS59UYXH2ldi/Mp7CJ1P9 bBtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=BVL/Dpqt; spf=pass (google.com: best guess record for domain of batv+8c5add14d4fec8f33fc9+5379+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+8c5add14d4fec8f33fc9+5379+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id f91-v6si1835394plb.510.2018.05.15.22.44.59 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 May 2018 22:44:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+8c5add14d4fec8f33fc9+5379+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=BVL/Dpqt; spf=pass (google.com: best guess record for domain of batv+8c5add14d4fec8f33fc9+5379+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+8c5add14d4fec8f33fc9+5379+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=HJIbFVL9Dcsydlgs2QtrsHEEM3Xyibuk+Bko5951718=; b=BVL/DpqtbqyAC6UO1c8QgrtXB PuCLgSi3tDy0qwL5dwrxJJOHOsHk31Kh1fPvgUBFaO9o6okuDkcy6t5he60upYYR3cMbisJbKti5A R3enT+G/Q0Lq5DTfpoHwKS/rv1jQWM3GyxvRz8bCYlmdWDgvpL93yOVaEAFwHk013lUpu0Y7bgdz6 n6P6mDGE2MQnuUHo31F7K1Kut1AbbeibUGUxm4MPwRpIxiH19nQSunfb2ttf6sQbpWv7lJInKjXPZ a7+/D2aaF/umAnioTgMdc7CyVlaE8v5/c6yXz1nvj8xio79K7kMkzVhiq3L3VoALSvi2xA10AY/06 h7KmrTzug==; Received: from [93.83.86.253] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fIpEm-0008FK-Qy; Wed, 16 May 2018 05:44:33 +0000 From: Christoph Hellwig To: Souptick Joarder , Matthew Wilcox Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, devel@lists.orangefs.org, ceph-devel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, ocfs2-devel@oss.oracle.com, linux-mtd@lists.infradead.org, dri-devel@lists.freedesktop.org, lustre-devel@lists.lustre.org, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org Subject: [PATCH 12/14] lustre: separate errno from VM_FAULT_* values Date: Wed, 16 May 2018 07:43:46 +0200 Message-Id: <20180516054348.15950-13-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-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Christoph Hellwig --- .../staging/lustre/lustre/llite/llite_mmap.c | 37 +++++++------------ .../lustre/lustre/llite/vvp_internal.h | 2 +- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c b/drivers/staging/lustre/lustre/llite/llite_mmap.c index 214b07554e62..061d98871959 100644 --- a/drivers/staging/lustre/lustre/llite/llite_mmap.c +++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c @@ -231,23 +231,18 @@ static int ll_page_mkwrite0(struct vm_area_struct *vma, struct page *vmpage, return result; } -static inline int to_fault_error(int result) +static inline vm_fault_t to_fault_error(int result) { switch (result) { case 0: - result = VM_FAULT_LOCKED; - break; + return VM_FAULT_LOCKED; case -EFAULT: - result = VM_FAULT_NOPAGE; - break; + return VM_FAULT_NOPAGE; case -ENOMEM: - result = VM_FAULT_OOM; - break; + return VM_FAULT_OOM; default: - result = VM_FAULT_SIGBUS; - break; + return VM_FAULT_SIGBUS; } - return result; } /** @@ -261,7 +256,7 @@ static inline int to_fault_error(int result) * \retval VM_FAULT_ERROR on general error * \retval NOPAGE_OOM not have memory for allocate new page */ -static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf) +static vm_fault_t ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf) { struct lu_env *env; struct cl_io *io; @@ -269,7 +264,7 @@ static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf) struct page *vmpage; unsigned long ra_flags; int result = 0; - int fault_ret = 0; + vm_fault_t fault_ret = 0; u16 refcheck; env = cl_env_get(&refcheck); @@ -323,7 +318,7 @@ static int ll_fault0(struct vm_area_struct *vma, struct vm_fault *vmf) return fault_ret; } -static int ll_fault(struct vm_fault *vmf) +static vm_fault_t ll_fault(struct vm_fault *vmf) { int count = 0; bool printed = false; @@ -364,7 +359,7 @@ static int ll_fault(struct vm_fault *vmf) return result; } -static int ll_page_mkwrite(struct vm_fault *vmf) +static vm_fault_t ll_page_mkwrite(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; int count = 0; @@ -390,22 +385,16 @@ static int ll_page_mkwrite(struct vm_fault *vmf) switch (result) { case 0: LASSERT(PageLocked(vmf->page)); - result = VM_FAULT_LOCKED; - break; + return VM_FAULT_LOCKED; case -ENODATA: case -EAGAIN: case -EFAULT: - result = VM_FAULT_NOPAGE; - break; + return VM_FAULT_NOPAGE; case -ENOMEM: - result = VM_FAULT_OOM; - break; + return VM_FAULT_OOM; default: - result = VM_FAULT_SIGBUS; - break; + return VM_FAULT_SIGBUS; } - - return result; } /** diff --git a/drivers/staging/lustre/lustre/llite/vvp_internal.h b/drivers/staging/lustre/lustre/llite/vvp_internal.h index 7d3abb43584a..c194966a3d82 100644 --- a/drivers/staging/lustre/lustre/llite/vvp_internal.h +++ b/drivers/staging/lustre/lustre/llite/vvp_internal.h @@ -83,7 +83,7 @@ struct vvp_io { /** * fault API used bitflags for return code. */ - unsigned int ft_flags; + vm_fault_t ft_flags; /** * check that flags are from filemap_fault */