Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11da37b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull two btrfs fixes from Chris Mason:
 "This has two fixes that we've been testing for 3.16, but since both
  are safe and fix real bugs, it makes sense to send for 3.15 instead"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: send, fix incorrect ref access when using extrefs
  Btrfs: fix EIO on reading file after ioctl clone works on it
parents 30625569 51a60253

fs/btrfs/ioctl.c

+5 −1
Original line number Diff line number Diff line
@@ -3120,6 +3120,8 @@ static int btrfs_clone(struct inode *src, struct inode *inode, 
			} else if (type == BTRFS_FILE_EXTENT_INLINE) {

				u64 skip = 0;

				u64 trim = 0;

				u64 aligned_end = 0;



				if (off > key.offset) {

					skip = off - key.offset;

					new_key.offset += skip;
@@ -3136,9 +3138,11 @@ static int btrfs_clone(struct inode *src, struct inode *inode, 
				size -= skip + trim;

				datal -= skip + trim;



				aligned_end = ALIGN(new_key.offset + datal,

						    root->sectorsize);

				ret = btrfs_drop_extents(trans, root, inode,

							 new_key.offset,

							 new_key.offset + datal,

							 aligned_end,

							 1);

				if (ret) {

					if (ret != -EOPNOTSUPP)

fs/btrfs/send.c

+1 −1
Original line number Diff line number Diff line
@@ -1668,7 +1668,7 @@ static int get_first_ref(struct btrfs_root *root, u64 ino, 
		goto out;

	}



	if (key.type == BTRFS_INODE_REF_KEY) {

	if (found_key.type == BTRFS_INODE_REF_KEY) {

		struct btrfs_inode_ref *iref;

		iref = btrfs_item_ptr(path->nodes[0], path->slots[0],

				      struct btrfs_inode_ref);