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

Commit 0813e22d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable 

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: btrfs_mark_extent_written uses the wrong slot
parents 382640b3 3f6fae95

fs/btrfs/file.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -720,13 +720,15 @@ int btrfs_mark_extent_written(struct btrfs_trans_handle *trans, 
					inode->i_ino, orig_offset);

					inode->i_ino, orig_offset);

		BUG_ON(ret);

		BUG_ON(ret);

	}

	}

	if (del_nr == 0) {

		fi = btrfs_item_ptr(leaf, path->slots[0],

		fi = btrfs_item_ptr(leaf, path->slots[0],

			   struct btrfs_file_extent_item);

			   struct btrfs_file_extent_item);

	if (del_nr == 0) {

		btrfs_set_file_extent_type(leaf, fi,

		btrfs_set_file_extent_type(leaf, fi,

					   BTRFS_FILE_EXTENT_REG);

					   BTRFS_FILE_EXTENT_REG);

		btrfs_mark_buffer_dirty(leaf);

		btrfs_mark_buffer_dirty(leaf);

	} else {

	} else {

		fi = btrfs_item_ptr(leaf, del_slot - 1,

			   struct btrfs_file_extent_item);

		btrfs_set_file_extent_type(leaf, fi,

		btrfs_set_file_extent_type(leaf, fi,

					   BTRFS_FILE_EXTENT_REG);

					   BTRFS_FILE_EXTENT_REG);

		btrfs_set_file_extent_num_bytes(leaf, fi,

		btrfs_set_file_extent_num_bytes(leaf, fi,