From patchwork Wed Apr 12 12:06:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 9677297 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 F237660325 for ; Wed, 12 Apr 2017 12:08:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4EB32865B for ; Wed, 12 Apr 2017 12:08:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9E4F28663; Wed, 12 Apr 2017 12:08:27 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 948E22865B for ; Wed, 12 Apr 2017 12:08:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752179AbdDLMIA (ORCPT ); Wed, 12 Apr 2017 08:08:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53692 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753836AbdDLMGd (ORCPT ); Wed, 12 Apr 2017 08:06:33 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 74B53624B9; Wed, 12 Apr 2017 12:06:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 74B53624B9 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jlayton@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 74B53624B9 Received: from ceres.poochiereds.net (ovpn-120-205.rdu2.redhat.com [10.10.120.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD25117CE0; Wed, 12 Apr 2017 12:06:32 +0000 (UTC) From: Jeff Layton To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, tytso@mit.edu, jack@suse.cz, willy@infradead.org, neilb@suse.com, viro@zeniv.linux.org.uk Subject: [PATCH v2 17/17] cifs: remove some unneeded mapping_set_error calls Date: Wed, 12 Apr 2017 08:06:14 -0400 Message-Id: <20170412120614.6111-18-jlayton@redhat.com> In-Reply-To: <20170412120614.6111-1-jlayton@redhat.com> References: <20170412120614.6111-1-jlayton@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 12 Apr 2017 12:06:33 +0000 (UTC) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that writeback errors are handled on a per-file basis using the new sequence counter method at the vfs layer, we no longer need to re-set errors in the mapping after doing writeback in non-fsync codepaths. Signed-off-by: Jeff Layton --- fs/cifs/cifsfs.c | 4 +--- fs/cifs/file.c | 4 +--- fs/cifs/inode.c | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index dd3f5fabfdf6..017a2d1d02c7 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -829,10 +829,8 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int whence) if (!CIFS_CACHE_READ(CIFS_I(inode)) && inode->i_mapping && inode->i_mapping->nrpages != 0) { rc = filemap_fdatawait(inode->i_mapping); - if (rc) { - mapping_set_error(inode->i_mapping, rc); + if (rc) return rc; - } } /* * Some applications poll for the file length in this strange diff --git a/fs/cifs/file.c b/fs/cifs/file.c index d9a3657b8d43..563c298c2a2a 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -722,9 +722,7 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) cinode = CIFS_I(inode); if (can_flush) { - rc = filemap_write_and_wait(inode->i_mapping); - mapping_set_error(inode->i_mapping, rc); - + filemap_write_and_wait(inode->i_mapping); if (tcon->unix_ext) rc = cifs_get_inode_info_unix(&inode, full_path, inode->i_sb, xid); diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index b261db34103c..f789d44d4b73 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -2178,8 +2178,7 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs) * will be truncated anyway? Also, should we error out here if * the flush returns error? */ - rc = filemap_write_and_wait(inode->i_mapping); - mapping_set_error(inode->i_mapping, rc); + filemap_write_and_wait(inode->i_mapping); rc = 0; if (attrs->ia_valid & ATTR_SIZE) { @@ -2321,8 +2320,7 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs) * will be truncated anyway? Also, should we error out here if * the flush returns error? */ - rc = filemap_write_and_wait(inode->i_mapping); - mapping_set_error(inode->i_mapping, rc); + filemap_write_and_wait(inode->i_mapping); rc = 0; if (attrs->ia_valid & ATTR_SIZE) {