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

Commit d7df025e 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 btrfs fixes from Chris Mason:
 "It turns out that we had two crc bugs when running fsx-linux in a
  loop.  Many thanks to Josef, Miao Xie, and Dave Sterba for nailing it
  all down.  Miao also has a new OOM fix in this v2 pull as well.

  Ilya fixed a regression Liu Bo found in the balance ioctls for pausing
  and resuming a running balance across drives.

  Josef's orphan truncate patch fixes an obscure corruption we'd see
  during xfstests.

  Arne's patches address problems with subvolume quotas.  If the user
  destroys quota groups incorrectly the FS will refuse to mount.

  The rest are smaller fixes and plugs for memory leaks."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (30 commits)
  Btrfs: fix repeated delalloc work allocation
  Btrfs: fix wrong max device number for single profile
  Btrfs: fix missed transaction->aborted check
  Btrfs: Add ACCESS_ONCE() to transaction->abort accesses
  Btrfs: put csums on the right ordered extent
  Btrfs: use right range to find checksum for compressed extents
  Btrfs: fix panic when recovering tree log
  Btrfs: do not allow logged extents to be merged or removed
  Btrfs: fix a regression in balance usage filter
  Btrfs: prevent qgroup destroy when there are still relations
  Btrfs: ignore orphan qgroup relations
  Btrfs: reorder locks and sanity checks in btrfs_ioctl_defrag
  Btrfs: fix unlock order in btrfs_ioctl_rm_dev
  Btrfs: fix unlock order in btrfs_ioctl_resize
  Btrfs: fix "mutually exclusive op is running" error code
  Btrfs: bring back balance pause/resume logic
  btrfs: update timestamps on truncate()
  btrfs: fix btrfs_cont_expand() freeing IS_ERR em
  Btrfs: fix a bug when llseek for delalloc bytes behind prealloc extents
  Btrfs: fix off-by-one in lseek
  ...
parents 66e2d3e8 1eafa6c7

fs/btrfs/extent-tree.c

+4 −2
Original line number Diff line number Diff line
@@ -3997,7 +3997,7 @@ again: 
	 * We make the other tasks wait for the flush only when we can flush

	 * all things.

	 */

	if (ret && flush == BTRFS_RESERVE_FLUSH_ALL) {

	if (ret && flush != BTRFS_RESERVE_NO_FLUSH) {

		flushing = true;

		space_info->flush = 1;

	}
@@ -5560,7 +5560,7 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans, 
	int empty_cluster = 2 * 1024 * 1024;

	struct btrfs_space_info *space_info;

	int loop = 0;

	int index = 0;

	int index = __get_raid_index(data);

	int alloc_type = (data & BTRFS_BLOCK_GROUP_DATA) ?

		RESERVE_ALLOC_NO_ACCOUNT : RESERVE_ALLOC;

	bool found_uncached_bg = false;
@@ -6788,11 +6788,13 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans, 
						       &wc->flags[level]);

			if (ret < 0) {

				btrfs_tree_unlock_rw(eb, path->locks[level]);

				path->locks[level] = 0;

				return ret;

			}

			BUG_ON(wc->refs[level] == 0);

			if (wc->refs[level] == 1) {

				btrfs_tree_unlock_rw(eb, path->locks[level]);

				path->locks[level] = 0;

				return 1;

			}

		}

fs/btrfs/extent_map.c

+12 −1
Original line number Diff line number Diff line
@@ -171,6 +171,10 @@ static int mergable_maps(struct extent_map *prev, struct extent_map *next) 
	if (test_bit(EXTENT_FLAG_COMPRESSED, &prev->flags))

		return 0;



	if (test_bit(EXTENT_FLAG_LOGGING, &prev->flags) ||

	    test_bit(EXTENT_FLAG_LOGGING, &next->flags))

		return 0;



	if (extent_map_end(prev) == next->start &&

	    prev->flags == next->flags &&

	    prev->bdev == next->bdev &&
@@ -255,6 +259,7 @@ int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len, 
	if (!em)

		goto out;



	if (!test_bit(EXTENT_FLAG_LOGGING, &em->flags))

		list_move(&em->list, &tree->modified_extents);

	em->generation = gen;

	clear_bit(EXTENT_FLAG_PINNED, &em->flags);
@@ -280,6 +285,12 @@ out: 


}



void clear_em_logging(struct extent_map_tree *tree, struct extent_map *em)

{

	clear_bit(EXTENT_FLAG_LOGGING, &em->flags);

	try_merge_map(tree, em);

}



/**

 * add_extent_mapping - add new extent map to the extent tree

 * @tree:	tree to insert new map in

fs/btrfs/extent_map.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ void free_extent_map(struct extent_map *em); 
int __init extent_map_init(void);

void extent_map_exit(void);

int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len, u64 gen);

void clear_em_logging(struct extent_map_tree *tree, struct extent_map *em);

struct extent_map *search_extent_mapping(struct extent_map_tree *tree,

					 u64 start, u64 len);

#endif

fs/btrfs/file-item.c

+2 −2
Original line number Diff line number Diff line
@@ -460,8 +460,8 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode, 
		if (!contig)

			offset = page_offset(bvec->bv_page) + bvec->bv_offset;



		if (!contig && (offset >= ordered->file_offset + ordered->len ||

		    offset < ordered->file_offset)) {

		if (offset >= ordered->file_offset + ordered->len ||

		    offset < ordered->file_offset) {

			unsigned long bytes_left;

			sums->len = this_sum_bytes;

			this_sum_bytes = 0;

fs/btrfs/file.c

+7 −3
Original line number Diff line number Diff line
@@ -2241,6 +2241,7 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence) 
	if (lockend <= lockstart)

		lockend = lockstart + root->sectorsize;



	lockend--;

	len = lockend - lockstart + 1;



	len = max_t(u64, len, root->sectorsize);
@@ -2307,11 +2308,14 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence) 
					}

				}



				if (!test_bit(EXTENT_FLAG_PREALLOC,

					      &em->flags)) {

					*offset = start;

					free_extent_map(em);

					break;

				}

			}

		}



		start = em->start + em->len;

		last_end = em->start + em->len;