diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-05-23 09:30:14 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-06-04 05:16:55 +0200 |
| commit | 45dd052e67ad17c7a24874a783f41aeab15bc294 (patch) | |
| tree | 8babffcf81e916cbe3e5a21b7bace3a040c0e11d /fs/iomap/fiemap.c | |
| parent | fs: move fiemap range validation into the file systems instances (diff) | |
| download | linux-45dd052e67ad17c7a24874a783f41aeab15bc294.tar.xz linux-45dd052e67ad17c7a24874a783f41aeab15bc294.zip | |
fs: handle FIEMAP_FLAG_SYNC in fiemap_prep
By moving FIEMAP_FLAG_SYNC handling to fiemap_prep we ensure it is
handled once instead of duplicated, but can still be done under fs locks,
like xfs/iomap intended with its duplicate handling. Also make sure the
error value of filemap_write_and_wait is propagated to user space.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Link: https://lore.kernel.org/r/20200523073016.2944131-8-hch@lst.de
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/iomap/fiemap.c')
| -rw-r--r-- | fs/iomap/fiemap.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/iomap/fiemap.c b/fs/iomap/fiemap.c index 89dca4a97e4a..aab070df4a21 100644 --- a/fs/iomap/fiemap.c +++ b/fs/iomap/fiemap.c @@ -75,16 +75,10 @@ int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi, ctx.fi = fi; ctx.prev.type = IOMAP_HOLE; - ret = fiemap_prep(inode, fi, start, &len, FIEMAP_FLAG_SYNC); + ret = fiemap_prep(inode, fi, start, &len, 0); if (ret) return ret; - if (fi->fi_flags & FIEMAP_FLAG_SYNC) { - ret = filemap_write_and_wait(inode->i_mapping); - if (ret) - return ret; - } - while (len > 0) { ret = iomap_apply(inode, start, len, IOMAP_REPORT, ops, &ctx, iomap_fiemap_actor); |