diff options
| author | Jan Schmidt <list.btrfs@jan-o-sch.net> | 2013-03-21 14:30:23 +0000 |
|---|---|---|
| committer | Josef Bacik <jbacik@fusionio.com> | 2013-03-28 09:51:26 -0400 |
| commit | adaa4b8e4d47eeb114513c2f7a172929154b94bd (patch) | |
| tree | dc440dfabc838099c99dae06c9ed0d5361e87ac9 /fs | |
| parent | 4adaa611020fa6ac65b0ac8db78276af4ec04e63 (diff) | |
| download | lwn-adaa4b8e4d47eeb114513c2f7a172929154b94bd.tar.gz lwn-adaa4b8e4d47eeb114513c2f7a172929154b94bd.zip | |
Btrfs: fix EIO from btrfs send in is_extent_unchanged for punched holes
When you take a snapshot, punch a hole where there has been data, then take
another snapshot and try to send an incremental stream, btrfs send would
give you EIO. That is because is_extent_unchanged had no support for holes
being punched. With this patch, instead of returning EIO we just return
0 (== the extent is not unchanged) and we're good.
Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
Cc: Alexander Block <ablock84@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/send.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 68da757615ae..ed897dc11356 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -3945,12 +3945,10 @@ static int is_extent_unchanged(struct send_ctx *sctx, found_key.type != key.type) { key.offset += right_len; break; - } else { - if (found_key.offset != key.offset + right_len) { - /* Should really not happen */ - ret = -EIO; - goto out; - } + } + if (found_key.offset != key.offset + right_len) { + ret = 0; + goto out; } key = found_key; } |