diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-15 18:27:12 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-15 18:27:12 +0200 |
| commit | cd2d95d97c8d1b66467507400c63d707ddb1deba (patch) | |
| tree | 7ad5223ba88110ca6735637c9eef327515e9bb96 /fs/btrfs/send.c | |
| parent | regulator: maintainers: Update email address for Liam (diff) | |
| parent | Linux 3.9-rc7 (diff) | |
| download | linux-cd2d95d97c8d1b66467507400c63d707ddb1deba.tar.xz linux-cd2d95d97c8d1b66467507400c63d707ddb1deba.zip | |
Merge tag 'v3.9-rc7' into regulator-fix-core
Linux 3.9-rc7
Trivial context overlap conflicts:
MAINTAINERS
Diffstat (limited to 'fs/btrfs/send.c')
| -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 f7a8b861058b..c85e7c6b4598 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; } |