From patchwork Thu Jul 21 10:40:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miklos Szeredi X-Patchwork-Id: 9241395 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 84F69602F0 for ; Thu, 21 Jul 2016 10:40:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 739E727D64 for ; Thu, 21 Jul 2016 10:40:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65DC527E33; Thu, 21 Jul 2016 10:40:46 +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 E990E27D64 for ; Thu, 21 Jul 2016 10:40:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752162AbcGUKkZ (ORCPT ); Thu, 21 Jul 2016 06:40:25 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:36994 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751892AbcGUKkX (ORCPT ); Thu, 21 Jul 2016 06:40:23 -0400 Received: by mail-wm0-f43.google.com with SMTP id i5so19831290wmg.0 for ; Thu, 21 Jul 2016 03:40:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+vIWo8/IbMm94bBb8hlkAURZTHQbHXeXac0cWtfFWAY=; b=dELlCKVcuObZGuBv4kGVcApg7LVTborxbt8UbtzFj0CgA4mXxr63nIkCz0Qip7gtXv XsdV2dNznIRy/bdh8vQKzoSiwQavjk55UJQMH6Zn8UnQa2szjnCkFzfDNOexI5bq9bKV UdLD86o0rj/J/B++XDHsAP6bWtgyZ7iap8ZBOMZySEGwfge+cccRWwUIxdBDYdjSOY2b RWwJcHlyos4UhnPXUzLg4eWZDbALLX4UpJZcT/1fTYnD39T6VsMG9seXtv2eVVbOHieL eNos+z2jot3fv+F1yg+NM7umzFmxBNTYgmoObTqJ8htLVq6iWlwVvrlMT/AoeboaqaC8 u2FQ== X-Gm-Message-State: ALyK8tKYBKqYevsDA4p7y5sgeeaMeelHSLVti0lOF/9fKPGrWKpSR4QbngtIvYHcPUxL68PY X-Received: by 10.28.227.11 with SMTP id a11mr17220641wmh.29.1469097620430; Thu, 21 Jul 2016 03:40:20 -0700 (PDT) Received: from veci.piliscsaba.szeredi.hu (pool-dsl-2c-0018.externet.hu. [217.173.44.24]) by smtp.gmail.com with ESMTPSA id k186sm576775wmd.13.2016.07.21.03.40.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jul 2016 03:40:19 -0700 (PDT) From: Miklos Szeredi To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Chris Mason , Jaegeuk Kim Subject: [PATCH] mm: export filemap_check_errors() to modules Date: Thu, 21 Jul 2016 12:40:18 +0200 Message-Id: <1469097618-3238-1-git-send-email-mszeredi@redhat.com> X-Mailer: git-send-email 2.5.5 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 And use it instead of opencoding in btrfs, f2fs and in fuse (coming up). Signed-off-by: Miklos Szeredi Cc: Chris Mason Cc: Jaegeuk Kim Reviewed-by: Omar Sandoval --- fs/btrfs/ctree.h | 1 - fs/btrfs/inode.c | 15 --------------- fs/btrfs/tree-log.c | 4 ++-- fs/f2fs/node.c | 7 ++----- include/linux/fs.h | 1 + mm/filemap.c | 3 ++- 6 files changed, 7 insertions(+), 24 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 4274a7bfdaed..425834193259 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3129,7 +3129,6 @@ int btrfs_prealloc_file_range_trans(struct inode *inode, struct btrfs_trans_handle *trans, int mode, u64 start, u64 num_bytes, u64 min_size, loff_t actual_len, u64 *alloc_hint); -int btrfs_inode_check_errors(struct inode *inode); extern const struct dentry_operations btrfs_dentry_operations; #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS void btrfs_test_inode_set_ops(struct inode *inode); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 4421954720b8..b22841625333 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10489,21 +10489,6 @@ out_inode: } -/* Inspired by filemap_check_errors() */ -int btrfs_inode_check_errors(struct inode *inode) -{ - int ret = 0; - - if (test_bit(AS_ENOSPC, &inode->i_mapping->flags) && - test_and_clear_bit(AS_ENOSPC, &inode->i_mapping->flags)) - ret = -ENOSPC; - if (test_bit(AS_EIO, &inode->i_mapping->flags) && - test_and_clear_bit(AS_EIO, &inode->i_mapping->flags)) - ret = -EIO; - - return ret; -} - static const struct inode_operations btrfs_dir_inode_operations = { .getattr = btrfs_getattr, .lookup = btrfs_lookup, diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index c05f69a8ec42..3c29b9357392 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -3944,7 +3944,7 @@ static int wait_ordered_extents(struct btrfs_trans_handle *trans, * i_mapping flags, so that the next fsync won't get * an outdated io error too. */ - btrfs_inode_check_errors(inode); + filemap_check_errors(inode->i_mapping); *ordered_io_error = true; break; } @@ -4181,7 +4181,7 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans, * without writing to the log tree and the fsync must report the * file data write error and not commit the current transaction. */ - ret = btrfs_inode_check_errors(inode); + ret = filemap_check_errors(inode->i_mapping); if (ret) ctx->io_err = ret; process: diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 1f21aae80c40..fde0e47fb119 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1521,7 +1521,7 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino) { pgoff_t index = 0, end = ULONG_MAX; struct pagevec pvec; - int ret2 = 0, ret = 0; + int ret2, ret = 0; pagevec_init(&pvec, 0); @@ -1550,10 +1550,7 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino) cond_resched(); } - if (unlikely(test_and_clear_bit(AS_ENOSPC, &NODE_MAPPING(sbi)->flags))) - ret2 = -ENOSPC; - if (unlikely(test_and_clear_bit(AS_EIO, &NODE_MAPPING(sbi)->flags))) - ret2 = -EIO; + ret2 = filemap_check_errors(NODE_MAPPING(sbi)); if (!ret) ret = ret2; return ret; diff --git a/include/linux/fs.h b/include/linux/fs.h index dd288148a6b1..6f2536a3a916 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2507,6 +2507,7 @@ extern int __filemap_fdatawrite_range(struct address_space *mapping, loff_t start, loff_t end, int sync_mode); extern int filemap_fdatawrite_range(struct address_space *mapping, loff_t start, loff_t end); +extern int filemap_check_errors(struct address_space *mapping); extern int vfs_fsync_range(struct file *file, loff_t start, loff_t end, int datasync); diff --git a/mm/filemap.c b/mm/filemap.c index 20f3b1f33f0e..6d92935dcf71 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -254,7 +254,7 @@ void delete_from_page_cache(struct page *page) } EXPORT_SYMBOL(delete_from_page_cache); -static int filemap_check_errors(struct address_space *mapping) +int filemap_check_errors(struct address_space *mapping) { int ret = 0; /* Check for outstanding write errors */ @@ -266,6 +266,7 @@ static int filemap_check_errors(struct address_space *mapping) ret = -EIO; return ret; } +EXPORT_SYMBOL(filemap_check_errors); /** * __filemap_fdatawrite_range - start writeback on mapping dirty pages in range