diff options
| author |   Chris Mason <chris.mason@oracle.com> | 2011-01-28 16:24:59 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-01-28 16:24:59 -0500 |
| commit | eab49bec41136460b12ac0fbeceeb88386d538c7 (patch) | |
| tree | d2ad3e163407d7779d53fdaa0dedcc3b934106de /fs/btrfs/ioctl.c | |
| parent | Btrfs: forced readonly mounts on errors (diff) | |
| parent | Btrfs: Fix file clone when source offset is not 0 (diff) | |
| download | linux-dev-eab49bec41136460b12ac0fbeceeb88386d538c7.tar.xz linux-dev-eab49bec41136460b12ac0fbeceeb88386d538c7.zip | |
Merge branch 'bug-fixes' of git://repo.or.cz/linux-btrfs-devel into btrfs-38
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index a506a22b522a..edd82becbb9e 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1898,7 +1898,10 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, memcpy(&new_key, &key, sizeof(new_key)); new_key.objectid = inode->i_ino; - new_key.offset = key.offset + destoff - off; + if (off <= key.offset) + new_key.offset = key.offset + destoff - off; + else + new_key.offset = destoff; trans = btrfs_start_transaction(root, 1); if (IS_ERR(trans)) { |