[PATCH 3.15-rc2] btrfs: replace error code from btrfs_drop_extents

[David Sterba]

There's a case which clone does not handle and used to BUG_ON instead,
(testcase xfstests/btrfs/035), now returns EINVAL. This error code is
confusing to the ioctl caller, as it normally signifies errorneous
arguments.

Change it to ENOPNOTSUPP which allows a fall back to copy instead of
clone. This does not affect the common reflink operation.

Signed-off-by: David Sterba dste...@suse.cz
---
 fs/btrfs/file.c  |6 +++---
 fs/btrfs/ioctl.c |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index eb742c07e7a4..bdd0b17150dd 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -800,7 +800,7 @@ next_slot:
if (start  key.offset  end  extent_end) {
BUG_ON(del_nr  0);
if (extent_type == BTRFS_FILE_EXTENT_INLINE) {
-   ret = -EINVAL;
+   ret = -EOPNOTSUPP;
break;
}
 
@@ -846,7 +846,7 @@ next_slot:
 */
if (start = key.offset  end  extent_end) {
if (extent_type == BTRFS_FILE_EXTENT_INLINE) {
-   ret = -EINVAL;
+   ret = -EOPNOTSUPP;
break;
}
 
@@ -872,7 +872,7 @@ next_slot:
if (start  key.offset  end = extent_end) {
BUG_ON(del_nr  0);
if (extent_type == BTRFS_FILE_EXTENT_INLINE) {
-   ret = -EINVAL;
+   ret = -EOPNOTSUPP;
break;
}
 
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index e79ff6b90cb7..2ad7de94efef 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3066,7 +3066,7 @@ process_slot:
 new_key.offset + datal,
 1);
if (ret) {
-   if (ret != -EINVAL)
+   if (ret != -EOPNOTSUPP)
btrfs_abort_transaction(trans,
root, ret);
btrfs_end_transaction(trans, root);
@@ -3141,7 +3141,7 @@ process_slot:
 new_key.offset + datal,
 1);
if (ret) {
-   if (ret != -EINVAL)
+   if (ret != -EOPNOTSUPP)
btrfs_abort_transaction(trans,
root, ret);
btrfs_end_transaction(trans, root);
-- 
1.7.9

--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3.15-rc2] btrfs: replace error code from btrfs_drop_extents

[Mitch Harder]

On Tue, Apr 15, 2014 at 11:50 AM, David Sterba dste...@suse.cz wrote:
 There's a case which clone does not handle and used to BUG_ON instead,
 (testcase xfstests/btrfs/035), now returns EINVAL. This error code is
 confusing to the ioctl caller, as it normally signifies errorneous
 arguments.

 Change it to ENOPNOTSUPP which allows a fall back to copy instead of
 clone. This does not affect the common reflink operation.


Minor spelling error in the commit message, you clearly mean
EOPNOTSUPP, not ENOPNOTSUPP.
--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html