Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp86460imm; Thu, 30 Aug 2018 16:36:53 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaTf5yWnJfQ9ohVIDklEekg8bjr3Yyg8p7Uv9McY1IhAqQzgKs/fbCzwHsTNL9BAnqG2t+T X-Received: by 2002:a17:902:708a:: with SMTP id z10-v6mr7871003plk.229.1535672213201; Thu, 30 Aug 2018 16:36:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535672213; cv=none; d=google.com; s=arc-20160816; b=PhDTUL5BfW19QvkxayXq0mfesangOylxh5lG/uxpiZNl/rQaf/eLLjC3BZ13g7WVM1 3doCI6MR2JFWsnTrCtcDRW2YXc73ww99BhrbnQ12jVXpEaIlgBydLe3JQNgKTH1Gt67K 8JLs1DYfuwin8Z44Hbh1jYs2q35HCR+a4aG4Bh/xuNEtCwFlARt/0fr6UzNo7Wj3q817 MQAXStoOXajcScMbBYXcKpcv5Htfn4TXQNKWhap1dq2xhET9NfI7lqNAemWcByA8jbaE 2RsOQ2nvZH+Ur0B2f401Wp4HUXaByQxj7KOFzu80ticyLpMhfENrLaotL3IRORBuTzUl 4bCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :arc-authentication-results; bh=hfkN7JxmWamJegGRSxig+elVMoZzBmU2dpP+v5q8Txs=; b=SMwQUaIWMW/4CjjUVU9jziCrIh1FQJb2nDpTRmZ6GrOwyrbg6uN6PoRyRctiQ2xBzD arJthyyzUweaDy73Ka8k+D8ZDavaLn+EfjZfomC+aPExx245Y2mrehFmJ3bbcvxvSUSs bKxic8QequCWk1sufFEyN0gOq7AR1seBu4sWk8FdUhmoBVIDkfdhbmc2fsyxJgRDVY92 2qOYQKyH7DDlRcvlNdPq6Brsc+dqR0VD1VZVo6yARkoh1aRtEdv1YAdmL5TWJnSI6hYP TIvwooliEiuCoXGVAHZjwwuTiLaOLYVO5DDWLXTDiXhHYv1BbltYan0Vd3vhgyXMBSxK umzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d5-v6si7443082plo.3.2018.08.30.16.36.38; Thu, 30 Aug 2018 16:36:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727282AbeHaDj7 (ORCPT + 99 others); Thu, 30 Aug 2018 23:39:59 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:42294 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725893AbeHaDj7 (ORCPT ); Thu, 30 Aug 2018 23:39:59 -0400 Received: from localhost.localdomain (c-24-4-154-175.hsd1.ca.comcast.net [24.4.154.175]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 98C49E51; Thu, 30 Aug 2018 23:35:22 +0000 (UTC) Date: Thu, 30 Aug 2018 16:35:21 -0700 From: Andrew Morton To: Souptick Joarder Cc: konishi.ryusuke@lab.ntt.co.jp, viro@zeniv.linux.org.uk, tytso@mit.edu, adilger.kernel@dilger.ca, axboe@kernel.dk, darrick.wong@oracle.com, ebiggers@google.com, pombredanne@nexb.com, agruenba@redhat.com, gregkh@linuxfoundation.org, kemi.wang@intel.com, willy@infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-nilfs@vger.kernel.org Subject: Re: [PATCH v2] fs: Convert return type int to vm_fault_t Message-Id: <20180830163521.728f3ff2fd3cc93b52a5dcc0@linux-foundation.org> In-Reply-To: <20180830172547.GA4408@jordon-HP-15-Notebook-PC> References: <20180830172547.GA4408@jordon-HP-15-Notebook-PC> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 30 Aug 2018 22:55:47 +0530 Souptick Joarder wrote: > Return type for fault handlers in ext4 and nilfs are > changed to use vm_fault_t. > > Return type of block_page_mkwrite() is changed from > int to vm_fault_t. The function signature of > block_page_mkwrite() is changed to add one new parameter > int *err. This will provide a way for caller functions > to get error value along with return value and use it > further. > > Return type of block_page_mkwrite_return() is also changed > to use new vm_fault_t type. > > Signed-off-by: Souptick Joarder > --- > v2: return type of nilfs_page_mkwrite() changed to vm_fault_t > Address Ryusuke's comment. remove err =0. The v1->v2 delta (below) reveals unchangelogged ext4 changes? --- a/fs/ext4/inode.c~fs-convert-return-type-int-to-vm_fault_t-v2 +++ a/fs/ext4/inode.c @@ -6174,14 +6174,13 @@ vm_fault_t ext4_page_mkwrite(struct vm_f if (err) goto out_ret; - err = 0; /* Delalloc case is easy... */ if (test_opt(inode->i_sb, DELALLOC) && !ext4_should_journal_data(inode) && !ext4_nonda_switch(inode->i_sb)) { do { ret = block_page_mkwrite(vma, vmf, - ext4_da_get_block_prep, &err); + ext4_da_get_block_prep, &err); } while (err == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries)); goto out; @@ -6227,7 +6226,6 @@ retry_alloc: ret = VM_FAULT_SIGBUS; goto out; } - err = 0; ret = block_page_mkwrite(vma, vmf, get_block, &err); if (!ret && ext4_should_journal_data(inode)) { if (ext4_walk_page_buffers(handle, page_buffers(page), 0, @@ -6239,8 +6237,7 @@ retry_alloc: ext4_set_inode_state(inode, EXT4_STATE_JDATA); } ext4_journal_stop(handle); - if (err == -ENOSPC && - ext4_should_retry_alloc(inode->i_sb, &retries)) + if (err == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries)) goto retry_alloc; out_ret: ret = block_page_mkwrite_return(err); --- a/fs/nilfs2/file.c~fs-convert-return-type-int-to-vm_fault_t-v2 +++ a/fs/nilfs2/file.c @@ -107,7 +107,6 @@ static vm_fault_t nilfs_page_mkwrite(str goto out; } - err = 0; file_update_time(vma->vm_file); ret = block_page_mkwrite(vma, vmf, nilfs_get_block, &err); if (ret) { _