diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-05-23 09:30:14 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-06-03 23:16:55 -0400 |
| commit | 45dd052e67ad17c7a24874a783f41aeab15bc294 (patch) | |
| tree | 8babffcf81e916cbe3e5a21b7bace3a040c0e11d /fs/ocfs2 | |
| parent | cddf8a2c4a8286ae60fc866eab59c8bc524e93a0 (diff) | |
| download | linux-45dd052e67ad17c7a24874a783f41aeab15bc294.tar.gz linux-45dd052e67ad17c7a24874a783f41aeab15bc294.tar.bz2 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/ocfs2')
| -rw-r--r-- | fs/ocfs2/extent_map.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index 3744179b73fa..a94852af5510 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c @@ -733,8 +733,6 @@ static int ocfs2_fiemap_inline(struct inode *inode, struct buffer_head *di_bh, return 0; } -#define OCFS2_FIEMAP_FLAGS (FIEMAP_FLAG_SYNC) - int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 map_start, u64 map_len) { @@ -746,8 +744,7 @@ int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, struct buffer_head *di_bh = NULL; struct ocfs2_extent_rec rec; - ret = fiemap_prep(inode, fieinfo, map_start, &map_len, - OCFS2_FIEMAP_FLAGS); + ret = fiemap_prep(inode, fieinfo, map_start, &map_len, 0); if (ret) return ret; |