Commit b930c264 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 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix meta data raid-repair merge problem
  Btrfs: skip allocation attempt from empty cluster
  Btrfs: skip block groups without enough space for a cluster
  Btrfs: start search for new cluster at the beginning
  Btrfs: reset cluster's max_size when creating bitmap
  Btrfs: initialize new bitmaps' list
  Btrfs: fix oops when calling statfs on readonly device
  Btrfs: Don't error on resizing FS to same size
  Btrfs: fix deadlock on metadata reservation when evicting a inode
  Fix URL of btrfs-progs git repository in docs
  btrfs scrub: handle -ENOMEM from init_ipath()
parents 11d814a2 f4a8e656

Documentation/filesystems/btrfs.txt

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ IRC network. 
Userspace tools for creating and manipulating Btrfs file systems are

available from the git repository at the following location:



 http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs-unstable.git

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

 http://git.kernel.org/?p=linux/kernel/git/mason/btrfs-progs.git

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



These include the following tools:

fs/btrfs/ctree.h

+3 −0
Original line number Diff line number Diff line
@@ -2369,6 +2369,9 @@ int btrfs_block_rsv_check(struct btrfs_root *root, 
int btrfs_block_rsv_refill(struct btrfs_root *root,

			  struct btrfs_block_rsv *block_rsv,

			  u64 min_reserved);

int btrfs_block_rsv_refill_noflush(struct btrfs_root *root,

				   struct btrfs_block_rsv *block_rsv,

				   u64 min_reserved);

int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src_rsv,

			    struct btrfs_block_rsv *dst_rsv,

			    u64 num_bytes);

fs/btrfs/extent-tree.c

+23 −11
Original line number Diff line number Diff line
@@ -3888,9 +3888,9 @@ int btrfs_block_rsv_check(struct btrfs_root *root, 
	return ret;

}



int btrfs_block_rsv_refill(struct btrfs_root *root,

static inline int __btrfs_block_rsv_refill(struct btrfs_root *root,

					   struct btrfs_block_rsv *block_rsv,

			  u64 min_reserved)

					   u64 min_reserved, int flush)

{

	u64 num_bytes = 0;

	int ret = -ENOSPC;
@@ -3909,7 +3909,7 @@ int btrfs_block_rsv_refill(struct btrfs_root *root, 
	if (!ret)

		return 0;



	ret = reserve_metadata_bytes(root, block_rsv, num_bytes, 1);

	ret = reserve_metadata_bytes(root, block_rsv, num_bytes, flush);

	if (!ret) {

		block_rsv_add_bytes(block_rsv, num_bytes, 0);

		return 0;
@@ -3918,6 +3918,20 @@ int btrfs_block_rsv_refill(struct btrfs_root *root, 
	return ret;

}



int btrfs_block_rsv_refill(struct btrfs_root *root,

			   struct btrfs_block_rsv *block_rsv,

			   u64 min_reserved)

{

	return __btrfs_block_rsv_refill(root, block_rsv, min_reserved, 1);

}



int btrfs_block_rsv_refill_noflush(struct btrfs_root *root,

				   struct btrfs_block_rsv *block_rsv,

				   u64 min_reserved)

{

	return __btrfs_block_rsv_refill(root, block_rsv, min_reserved, 0);

}



int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src_rsv,

			    struct btrfs_block_rsv *dst_rsv,

			    u64 num_bytes)
@@ -5265,7 +5279,7 @@ alloc: 
		spin_lock(&block_group->free_space_ctl->tree_lock);

		if (cached &&

		    block_group->free_space_ctl->free_space <

		    num_bytes + empty_size) {

		    num_bytes + empty_cluster + empty_size) {

			spin_unlock(&block_group->free_space_ctl->tree_lock);

			goto loop;

		}
@@ -5286,12 +5300,10 @@ alloc: 
			 * people trying to start a new cluster

			 */

			spin_lock(&last_ptr->refill_lock);

			if (last_ptr->block_group &&

			    (last_ptr->block_group->ro ||

			    !block_group_bits(last_ptr->block_group, data))) {

				offset = 0;

			if (!last_ptr->block_group ||

			    last_ptr->block_group->ro ||

			    !block_group_bits(last_ptr->block_group, data))

				goto refill_cluster;

			}



			offset = btrfs_alloc_from_cluster(block_group, last_ptr,

						 num_bytes, search_start);
@@ -5342,7 +5354,7 @@ refill_cluster: 
			/* allocate a cluster in this block group */

			ret = btrfs_find_space_cluster(trans, root,

					       block_group, last_ptr,

					       offset, num_bytes,

					       search_start, num_bytes,

					       empty_cluster + empty_size);

			if (ret == 0) {

				/*

fs/btrfs/extent_io.c

+20 −7
Original line number Diff line number Diff line
@@ -2287,14 +2287,20 @@ static void end_bio_extent_readpage(struct bio *bio, int err) 
		if (!uptodate) {

			int failed_mirror;

			failed_mirror = (int)(unsigned long)bio->bi_bdev;

			if (tree->ops && tree->ops->readpage_io_failed_hook)

				ret = tree->ops->readpage_io_failed_hook(

						bio, page, start, end,

						failed_mirror, state);

			else

			/*

			 * The generic bio_readpage_error handles errors the

			 * following way: If possible, new read requests are

			 * created and submitted and will end up in

			 * end_bio_extent_readpage as well (if we're lucky, not

			 * in the !uptodate case). In that case it returns 0 and

			 * we just go on with the next page in our bio. If it

			 * can't handle the error it will return -EIO and we

			 * remain responsible for that page.

			 */

			ret = bio_readpage_error(bio, page, start, end,

							failed_mirror, NULL);

			if (ret == 0) {

error_handled:

				uptodate =

					test_bit(BIO_UPTODATE, &bio->bi_flags);

				if (err)
@@ -2302,6 +2308,13 @@ static void end_bio_extent_readpage(struct bio *bio, int err) 
				uncache_state(&cached);

				continue;

			}

			if (tree->ops && tree->ops->readpage_io_failed_hook) {

				ret = tree->ops->readpage_io_failed_hook(

							bio, page, start, end,

							failed_mirror, state);

				if (ret == 0)

					goto error_handled;

			}

		}



		if (uptodate) {

fs/btrfs/free-space-cache.c

+2 −0
Original line number Diff line number Diff line
@@ -1470,6 +1470,7 @@ static void add_new_bitmap(struct btrfs_free_space_ctl *ctl, 
{

	info->offset = offset_to_bitmap(ctl, offset);

	info->bytes = 0;

	INIT_LIST_HEAD(&info->list);

	link_free_space(ctl, info);

	ctl->total_bitmaps++;
@@ -2319,6 +2320,7 @@ again: 


	if (!found) {

		start = i;

		cluster->max_size = 0;

		found = true;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE