| Message ID | 20151121005014.20398.22316.stgit@birch.djwong.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
> --- a/tests/generic/158.out > +++ b/tests/generic/158.out > Try to dedupe a device > -XFS_IOC_FILE_EXTENT_SAME: Permission denied > +XFS_IOC_FILE_EXTENT_SAME: Invalid argument > Try to dedupe to a dir > -/mnt/test-158/dir1: Is a directory > +TEST_DIR/test-158/dir1: Is a directory > Try to dedupe to a device > -dedupe: Permission denied > +dedupe: Operation not supported > Try to dedupe to a fifo > -dedupe: Permission denied > +dedupe: Operation not supported Shouldn't these be Invalid argument just like the to a device case above or the clone case? Otherwise looks good, Reviewed-by: Christoph Hellwig <hch@lst.de> -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, Nov 21, 2015 at 10:06:44AM -0800, Christoph Hellwig wrote: > > --- a/tests/generic/158.out > > +++ b/tests/generic/158.out > > Try to dedupe a device > > -XFS_IOC_FILE_EXTENT_SAME: Permission denied > > +XFS_IOC_FILE_EXTENT_SAME: Invalid argument > > Try to dedupe to a dir > > -/mnt/test-158/dir1: Is a directory > > +TEST_DIR/test-158/dir1: Is a directory > > Try to dedupe to a device > > -dedupe: Permission denied > > +dedupe: Operation not supported > > Try to dedupe to a fifo > > -dedupe: Permission denied > > +dedupe: Operation not supported > > Shouldn't these be Invalid argument just like the > to a device case above or the clone case? I was trying to mirror the behavior of reflink, which spits out EOPNOTSUPP when the destination isn't a regular file and EINVAL when the source isn't a regular file. --D > > Otherwise looks good, > > Reviewed-by: Christoph Hellwig <hch@lst.de> -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Nov 23, 2015 at 01:25:33PM -0800, Darrick J. Wong wrote: > > Shouldn't these be Invalid argument just like the > > to a device case above or the clone case? > > I was trying to mirror the behavior of reflink, which spits out > EOPNOTSUPP when the destination isn't a regular file and EINVAL > when the source isn't a regular file. clone is called on the destination and takes the source from the ioctl argument. dedupe is called on the source and then opens the destinations, so they're not really comparable. Btrfs currently returns EACCES for non-dir, non-regular destinations which look wrong and I think EINVAL for a mismatch between source and destination types would make most sense. I've also prepared a btrfs patch for this and clone, but I'd like to have consensus on the exact error first. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tests/generic/157 b/tests/generic/157 index a43fb0d..f3de285 100755 --- a/tests/generic/157 +++ b/tests/generic/157 @@ -75,10 +75,14 @@ mkdir "$TESTDIR1/dir1" seq 1 $((2 * BLKSZ / 250)) | while read f; do touch "$TESTDIR1/dir1/$f" done -mknod "$TESTDIR1/dev1" b 8 0 +mknod "$TESTDIR1/dev1" c 1 3 mkfifo "$TESTDIR1/fifo1" sync +_filter_enotty() { + sed -e 's/Inappropriate ioctl for device/Operation not supported/g' +} + echo "Try cross-device reflink" _reflink_range "$TESTDIR1/file1" 0 "$TESTDIR2/file1" 0 $BLKSZ @@ -98,13 +102,13 @@ echo "Try to reflink a device" _reflink_range "$TESTDIR1/dev1" 0 "$TESTDIR1/file2" 0 $BLKSZ echo "Try to reflink to a dir" -_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/dir1" 0 $BLKSZ +_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/dir1" 0 $BLKSZ 2>&1 | _filter_test_dir echo "Try to reflink to a device" -_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/dev1" 0 $BLKSZ +_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/dev1" 0 $BLKSZ 2>&1 | _filter_enotty echo "Try to reflink to a fifo" -_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/fifo1" 0 $BLKSZ -n +_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/fifo1" 0 $BLKSZ -n 2>&1 | _filter_enotty echo "Try to reflink an append-only file" _reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/file3" 0 $BLKSZ -a diff --git a/tests/generic/157.out b/tests/generic/157.out index 177e7f8..3a690ca 100644 --- a/tests/generic/157.out +++ b/tests/generic/157.out @@ -14,7 +14,7 @@ XFS_IOC_CLONE_RANGE: Is a directory Try to reflink a device XFS_IOC_CLONE_RANGE: Invalid argument Try to reflink to a dir -/mnt/test-157/dir1: Is a directory +TEST_DIR/test-157/dir1: Is a directory Try to reflink to a device XFS_IOC_CLONE_RANGE: Operation not supported Try to reflink to a fifo diff --git a/tests/generic/158 b/tests/generic/158 index a499b21..db5d05c 100755 --- a/tests/generic/158 +++ b/tests/generic/158 @@ -76,10 +76,14 @@ mkdir "$TESTDIR1/dir1" seq 1 $((2 * BLKSZ / 250)) | while read f; do touch "$TESTDIR1/dir1/$f" done -mknod "$TESTDIR1/dev1" b 8 0 +mknod "$TESTDIR1/dev1" c 1 3 mkfifo "$TESTDIR1/fifo1" sync +_filter_enotty() { + sed -e 's/Inappropriate ioctl for device/Invalid argument/g' +} + echo "Try cross-device dedupe" _dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR2/file1" 0 $BLKSZ @@ -96,10 +100,10 @@ echo "Try to dedupe a dir" _dedupe_range "$TESTDIR1/dir1" 0 "$TESTDIR1/file2" 0 $BLKSZ echo "Try to dedupe a device" -_dedupe_range "$TESTDIR1/dev1" 0 "$TESTDIR1/file2" 0 $BLKSZ +_dedupe_range "$TESTDIR1/dev1" 0 "$TESTDIR1/file2" 0 $BLKSZ 2>&1 | _filter_enotty echo "Try to dedupe to a dir" -_dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/dir1" 0 $BLKSZ +_dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/dir1" 0 $BLKSZ 2>&1 | _filter_test_dir echo "Try to dedupe to a device" _dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/dev1" 0 $BLKSZ diff --git a/tests/generic/158.out b/tests/generic/158.out index 36a3f1f..1210429 100644 --- a/tests/generic/158.out +++ b/tests/generic/158.out @@ -12,13 +12,13 @@ dedupe: Invalid argument Try to dedupe a dir XFS_IOC_FILE_EXTENT_SAME: Is a directory Try to dedupe a device -XFS_IOC_FILE_EXTENT_SAME: Permission denied +XFS_IOC_FILE_EXTENT_SAME: Invalid argument Try to dedupe to a dir -/mnt/test-158/dir1: Is a directory +TEST_DIR/test-158/dir1: Is a directory Try to dedupe to a device -dedupe: Permission denied +dedupe: Operation not supported Try to dedupe to a fifo -dedupe: Permission denied +dedupe: Operation not supported Try to dedupe an append-only file Dedupe two files Check scratch fs
Fix the error messages in the golden output for generic/15[78], which examine the responses to invalid inputs as returned by the clone/clone_range/extent_same ioctls. Also fix a filtering omission. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- tests/generic/157 | 12 ++++++++---- tests/generic/157.out | 2 +- tests/generic/158 | 10 +++++++--- tests/generic/158.out | 8 ++++---- 4 files changed, 20 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html