Commit 45dd052e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Theodore Ts'o
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Link: https://lore.kernel.org/r/20200523073016.2944131-8-hch@lst.de


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent cddf8a2c

fs/btrfs/inode.c

+1 −3
Original line number Diff line number Diff line
@@ -8243,14 +8243,12 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
	return ret;

}



#define BTRFS_FIEMAP_FLAGS	(FIEMAP_FLAG_SYNC)



static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

		__u64 start, __u64 len)

{

	int	ret;



	ret = fiemap_prep(inode, fieinfo, start, &len, BTRFS_FIEMAP_FLAGS);

	ret = fiemap_prep(inode, fieinfo, start, &len, 0);

	if (ret)

		return ret;

fs/cifs/smb2ops.c

+1 −2
Original line number Diff line number Diff line
@@ -3408,8 +3408,7 @@ static int smb3_fiemap(struct cifs_tcon *tcon, 
	int i, num, rc, flags, last_blob;

	u64 next;



	rc = fiemap_prep(d_inode(cfile->dentry), fei, start, &len,

			FIEMAP_FLAG_SYNC);

	rc = fiemap_prep(d_inode(cfile->dentry), fei, start, &len, 0);

	if (rc)

		return rc;

fs/ext4/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -4938,7 +4938,7 @@ int ext4_get_es_cache(struct inode *inode, struct fiemap_extent_info *fieinfo, 
		fieinfo->fi_flags &= ~FIEMAP_FLAG_CACHE;

	}



	error = fiemap_prep(inode, fieinfo, start, &len, FIEMAP_FLAG_SYNC);

	error = fiemap_prep(inode, fieinfo, start, &len, 0);

	if (error)

		return error;

fs/ext4/ioctl.c

+0 −3
Original line number Diff line number Diff line
@@ -759,9 +759,6 @@ static int ext4_ioctl_get_es_cache(struct file *filp, unsigned long arg) 
		       fieinfo.fi_extents_max * sizeof(struct fiemap_extent)))

		return -EFAULT;



	if (fieinfo.fi_flags & FIEMAP_FLAG_SYNC)

		filemap_write_and_wait(inode->i_mapping);



	error = ext4_get_es_cache(inode, &fieinfo, fiemap.fm_start,

			fiemap.fm_length);

	fiemap.fm_flags = fieinfo.fi_flags;

fs/f2fs/data.c

+1 −2
Original line number Diff line number Diff line
@@ -1825,8 +1825,7 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 
			return ret;

	}



	ret = fiemap_prep(inode, fieinfo, start, &len,

			FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR);

	ret = fiemap_prep(inode, fieinfo, start, &len, FIEMAP_FLAG_XATTR);

	if (ret)

		return ret;