Commit d58b0d98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more btrfs updates from Chris Mason:
 "This is part two of my btrfs pull, which is some cleanups and a batch
  of fixes.

  Most of the code here is from Jeff Mahoney, making the pointers we
  pass around internally more consistent and less confusing overall.  I
  noticed a small problem right before I sent this out yesterday, so I
  fixed it up and re-tested overnight"

* 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (40 commits)
  Btrfs: fix __MAX_CSUM_ITEMS
  btrfs: btrfs_abort_transaction, drop root parameter
  btrfs: add btrfs_trans_handle->fs_info pointer
  btrfs: btrfs_relocate_chunk pass extent_root to btrfs_end_transaction
  btrfs: convert nodesize macros to static inlines
  btrfs: introduce BTRFS_MAX_ITEM_SIZE
  btrfs: cleanup, remove prototype for btrfs_find_root_ref
  btrfs: copy_to_sk drop unused root parameter
  btrfs: simpilify btrfs_subvol_inherit_props
  btrfs: tests, use BTRFS_FS_STATE_DUMMY_FS_INFO instead of dummy root
  btrfs: tests, require fs_info for root
  btrfs: tests, move initialization into tests/
  btrfs: btrfs_test_opt and friends should take a btrfs_fs_info
  btrfs: prefix fsid to all trace events
  btrfs: plumb fs_info into btrfs_work
  btrfs: remove obsolete part of comment in statfs
  btrfs: hide test-only member under ifdef
  btrfs: Ratelimit "no csum found" info message
  btrfs: Add ratelimit to btrfs printing
  Btrfs: fix unexpected balance crash due to BUG_ON
  ...
parents 3a303258 42049bf6

fs/btrfs/acl.c

+1 −2
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type) 
	}

	if (size > 0) {

		acl = posix_acl_from_xattr(&init_user_ns, value, size);

	} else if (size == -ENOENT || size == -ENODATA || size == 0) {

		/* FIXME, who returns -ENOENT?  I think nobody */

	} else if (size == -ERANGE || size == -ENODATA || size == 0) {

		acl = NULL;

	} else {

		acl = ERR_PTR(-EIO);

fs/btrfs/async-thread.c

+25 −6
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ 


struct __btrfs_workqueue {

	struct workqueue_struct *normal_wq;



	/* File system this workqueue services */

	struct btrfs_fs_info *fs_info;



	/* List head pointing to ordered work list */

	struct list_head ordered_list;
@@ -70,6 +74,18 @@ void btrfs_##name(struct work_struct *arg) \ 
	normal_work_helper(work);					\

}



struct btrfs_fs_info *

btrfs_workqueue_owner(struct __btrfs_workqueue *wq)

{

	return wq->fs_info;

}



struct btrfs_fs_info *

btrfs_work_owner(struct btrfs_work *work)

{

	return work->wq->fs_info;

}



BTRFS_WORK_HELPER(worker_helper);

BTRFS_WORK_HELPER(delalloc_helper);

BTRFS_WORK_HELPER(flush_delalloc_helper);
@@ -94,14 +110,15 @@ BTRFS_WORK_HELPER(scrubnc_helper); 
BTRFS_WORK_HELPER(scrubparity_helper);



static struct __btrfs_workqueue *

__btrfs_alloc_workqueue(const char *name, unsigned int flags, int limit_active,

			 int thresh)

__btrfs_alloc_workqueue(struct btrfs_fs_info *fs_info, const char *name,

			unsigned int flags, int limit_active, int thresh)

{

	struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_KERNEL);



	if (!ret)

		return NULL;



	ret->fs_info = fs_info;

	ret->limit_active = limit_active;

	atomic_set(&ret->pending, 0);

	if (thresh == 0)
@@ -143,7 +160,8 @@ __btrfs_alloc_workqueue(const char *name, unsigned int flags, int limit_active, 
static inline void

__btrfs_destroy_workqueue(struct __btrfs_workqueue *wq);



struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,

struct btrfs_workqueue *btrfs_alloc_workqueue(struct btrfs_fs_info *fs_info,

					      const char *name,

					      unsigned int flags,

					      int limit_active,

					      int thresh)
@@ -153,7 +171,8 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, 
	if (!ret)

		return NULL;



	ret->normal = __btrfs_alloc_workqueue(name, flags & ~WQ_HIGHPRI,

	ret->normal = __btrfs_alloc_workqueue(fs_info, name,

					      flags & ~WQ_HIGHPRI,

					      limit_active, thresh);

	if (!ret->normal) {

		kfree(ret);
@@ -161,8 +180,8 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, 
	}



	if (flags & WQ_HIGHPRI) {

		ret->high = __btrfs_alloc_workqueue(name, flags, limit_active,

						    thresh);

		ret->high = __btrfs_alloc_workqueue(fs_info, name, flags,

						    limit_active, thresh);

		if (!ret->high) {

			__btrfs_destroy_workqueue(ret->normal);

			kfree(ret);

fs/btrfs/async-thread.h

+5 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#define __BTRFS_ASYNC_THREAD_

#include <linux/workqueue.h>



struct btrfs_fs_info;

struct btrfs_workqueue;

/* Internal use only */

struct __btrfs_workqueue;
@@ -67,7 +68,8 @@ BTRFS_WORK_HELPER_PROTO(scrubnc_helper); 
BTRFS_WORK_HELPER_PROTO(scrubparity_helper);





struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,

struct btrfs_workqueue *btrfs_alloc_workqueue(struct btrfs_fs_info *fs_info,

					      const char *name,

					      unsigned int flags,

					      int limit_active,

					      int thresh);
@@ -80,4 +82,6 @@ void btrfs_queue_work(struct btrfs_workqueue *wq, 
void btrfs_destroy_workqueue(struct btrfs_workqueue *wq);

void btrfs_workqueue_set_max(struct btrfs_workqueue *wq, int max);

void btrfs_set_work_high_priority(struct btrfs_work *work);

struct btrfs_fs_info *btrfs_work_owner(struct btrfs_work *work);

struct btrfs_fs_info *btrfs_workqueue_owner(struct __btrfs_workqueue *wq);

#endif

fs/btrfs/backref.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ int __init btrfs_prelim_ref_init(void) 
	btrfs_prelim_ref_cache = kmem_cache_create("btrfs_prelim_ref",

					sizeof(struct __prelim_ref),

					0,

					SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD,

					SLAB_MEM_SPREAD,

					NULL);

	if (!btrfs_prelim_ref_cache)

		return -ENOMEM;
@@ -361,7 +361,7 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info, 
		goto out;

	}



	if (btrfs_test_is_dummy_root(root)) {

	if (btrfs_is_testing(fs_info)) {

		srcu_read_unlock(&fs_info->subvol_srcu, index);

		ret = -ENOENT;

		goto out;

fs/btrfs/compression.c

+8 −2
Original line number Diff line number Diff line
@@ -403,7 +403,10 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
			}



			ret = btrfs_map_bio(root, bio, 0, 1);

			BUG_ON(ret); /* -ENOMEM */

			if (ret) {

				bio->bi_error = ret;

				bio_endio(bio);

			}



			bio_put(bio);
@@ -434,7 +437,10 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	}



	ret = btrfs_map_bio(root, bio, 0, 1);

	BUG_ON(ret); /* -ENOMEM */

	if (ret) {

		bio->bi_error = ret;

		bio_endio(bio);

	}



	bio_put(bio);

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE