| Message ID | 20240827065123.1762168-2-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/6] block: remove checks for FALLOC_FL_NO_HIDE_STALE | expand |
On Tue, Aug 27, 2024 at 08:50:45AM +0200, Christoph Hellwig wrote: > While the FALLOC_FL_NO_HIDE_STALE value has been registered, it has > always been rejected by vfs_fallocate before making it into > blkdev_fallocate because it isn't in the supported mask. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Yeah, I guess that never worked. Oh well. BLKDISCARD it is. Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > block/fops.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/block/fops.c b/block/fops.c > index 9825c1713a49a9..7f48f03a62e9a8 100644 > --- a/block/fops.c > +++ b/block/fops.c > @@ -771,7 +771,7 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to) > > #define BLKDEV_FALLOC_FL_SUPPORTED \ > (FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | \ > - FALLOC_FL_ZERO_RANGE | FALLOC_FL_NO_HIDE_STALE) > + FALLOC_FL_ZERO_RANGE) > > static long blkdev_fallocate(struct file *file, int mode, loff_t start, > loff_t len) > @@ -830,14 +830,6 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, > len >> SECTOR_SHIFT, GFP_KERNEL, > BLKDEV_ZERO_NOFALLBACK); > break; > - case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE: > - error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); > - if (error) > - goto fail; > - > - error = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, > - len >> SECTOR_SHIFT, GFP_KERNEL); > - break; > default: > error = -EOPNOTSUPP; > } > -- > 2.43.0 > >
On Tue, 27 Aug 2024 08:50:45 +0200, Christoph Hellwig wrote: > While the FALLOC_FL_NO_HIDE_STALE value has been registered, it has > always been rejected by vfs_fallocate before making it into > blkdev_fallocate because it isn't in the supported mask. > > Applied to the vfs.fallocate branch of the vfs/vfs.git tree. Patches in the vfs.fallocate branch should appear in linux-next soon. Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it. It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated. Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch. tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs.fallocate [1/6] block: remove checks for FALLOC_FL_NO_HIDE_STALE https://git.kernel.org/vfs/vfs/c/a24dfa515642 [2/6] ext4: remove tracing for FALLOC_FL_NO_HIDE_STALE https://git.kernel.org/vfs/vfs/c/c5a8e5423301 [3/6] fs: sort out the fallocate mode vs flag mess https://git.kernel.org/vfs/vfs/c/2f6369068139 [4/6] xfs: call xfs_flush_unmap_range from xfs_free_file_space https://git.kernel.org/vfs/vfs/c/2764727be269 [5/6] xfs: move the xfs_is_always_cow_inode check into xfs_alloc_file_space https://git.kernel.org/vfs/vfs/c/12206b1c423b [6/6] xfs: refactor xfs_file_fallocate https://git.kernel.org/vfs/vfs/c/a0c3802f87a2
On Tue 27-08-24 08:50:45, Christoph Hellwig wrote: > While the FALLOC_FL_NO_HIDE_STALE value has been registered, it has > always been rejected by vfs_fallocate before making it into > blkdev_fallocate because it isn't in the supported mask. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > block/fops.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/block/fops.c b/block/fops.c > index 9825c1713a49a9..7f48f03a62e9a8 100644 > --- a/block/fops.c > +++ b/block/fops.c > @@ -771,7 +771,7 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to) > > #define BLKDEV_FALLOC_FL_SUPPORTED \ > (FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | \ > - FALLOC_FL_ZERO_RANGE | FALLOC_FL_NO_HIDE_STALE) > + FALLOC_FL_ZERO_RANGE) > > static long blkdev_fallocate(struct file *file, int mode, loff_t start, > loff_t len) > @@ -830,14 +830,6 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, > len >> SECTOR_SHIFT, GFP_KERNEL, > BLKDEV_ZERO_NOFALLBACK); > break; > - case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE: > - error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); > - if (error) > - goto fail; > - > - error = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, > - len >> SECTOR_SHIFT, GFP_KERNEL); > - break; > default: > error = -EOPNOTSUPP; > } > -- > 2.43.0 >
diff --git a/block/fops.c b/block/fops.c index 9825c1713a49a9..7f48f03a62e9a8 100644 --- a/block/fops.c +++ b/block/fops.c @@ -771,7 +771,7 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to) #define BLKDEV_FALLOC_FL_SUPPORTED \ (FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | \ - FALLOC_FL_ZERO_RANGE | FALLOC_FL_NO_HIDE_STALE) + FALLOC_FL_ZERO_RANGE) static long blkdev_fallocate(struct file *file, int mode, loff_t start, loff_t len) @@ -830,14 +830,6 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, len >> SECTOR_SHIFT, GFP_KERNEL, BLKDEV_ZERO_NOFALLBACK); break; - case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE: - error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end); - if (error) - goto fail; - - error = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, - len >> SECTOR_SHIFT, GFP_KERNEL); - break; default: error = -EOPNOTSUPP; }
While the FALLOC_FL_NO_HIDE_STALE value has been registered, it has always been rejected by vfs_fallocate before making it into blkdev_fallocate because it isn't in the supported mask. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/fops.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)