* [PATCH] mm: export filemap_check_errors() to modules
@ 2016-07-21 10:40 Miklos Szeredi
2016-07-21 19:06 ` Omar Sandoval
0 siblings, 1 reply; 2+ messages in thread
From: Miklos Szeredi @ 2016-07-21 10:40 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-fsdevel, linux-mm, Chris Mason, Jaegeuk Kim
And use it instead of opencoding in btrfs, f2fs and in fuse (coming up).
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Cc: Chris Mason <clm@fb.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
---
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
--
2.5.5
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mm: export filemap_check_errors() to modules
2016-07-21 10:40 [PATCH] mm: export filemap_check_errors() to modules Miklos Szeredi
@ 2016-07-21 19:06 ` Omar Sandoval
0 siblings, 0 replies; 2+ messages in thread
From: Omar Sandoval @ 2016-07-21 19:06 UTC (permalink / raw)
To: Miklos Szeredi
Cc: linux-kernel, linux-fsdevel, linux-mm, Chris Mason, Jaegeuk Kim
On Thu, Jul 21, 2016 at 12:40:18PM +0200, Miklos Szeredi wrote:
> And use it instead of opencoding in btrfs, f2fs and in fuse (coming up).
>
> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
> Cc: Chris Mason <clm@fb.com>
> Cc: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> 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:
Btrfs part looks fine.
Reviewed-by: Omar Sandoval <osandov@fb.com>
--
Omar
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-21 19:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-21 10:40 [PATCH] mm: export filemap_check_errors() to modules Miklos Szeredi
2016-07-21 19:06 ` Omar Sandoval
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).