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

Commit bbf65cf0 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'cleanup/misc-for-3.18' of... 

Merge branch 'cleanup/misc-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

 into for-linus

Signed-off-by: default avatarChris Mason <clm@fb.com>

Conflicts:
	fs/btrfs/extent_io.c
parents bf8e8ca6 fccb84c9

fs/btrfs/compression.c

+7 −4
Original line number Diff line number Diff line
@@ -388,7 +388,8 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
			 * freed before we're done setting it up

			 */

			atomic_inc(&cb->pending_bios);

			ret = btrfs_bio_wq_end_io(root->fs_info, bio, 0);

			ret = btrfs_bio_wq_end_io(root->fs_info, bio,

					BTRFS_WQ_ENDIO_DATA);

			BUG_ON(ret); /* -ENOMEM */



			if (!skip_sum) {
@@ -419,7 +420,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	}

	bio_get(bio);



	ret = btrfs_bio_wq_end_io(root->fs_info, bio, 0);

	ret = btrfs_bio_wq_end_io(root->fs_info, bio, BTRFS_WQ_ENDIO_DATA);

	BUG_ON(ret); /* -ENOMEM */



	if (!skip_sum) {
@@ -668,7 +669,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
		    PAGE_CACHE_SIZE) {

			bio_get(comp_bio);



			ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio, 0);

			ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio,

					BTRFS_WQ_ENDIO_DATA);

			BUG_ON(ret); /* -ENOMEM */



			/*
@@ -706,7 +708,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	}

	bio_get(comp_bio);



	ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio, 0);

	ret = btrfs_bio_wq_end_io(root->fs_info, comp_bio,

			BTRFS_WQ_ENDIO_DATA);

	BUG_ON(ret); /* -ENOMEM */



	if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {

fs/btrfs/ctree.c

+3 −5
Original line number Diff line number Diff line
@@ -1506,10 +1506,9 @@ static inline int should_cow_block(struct btrfs_trans_handle *trans, 
				   struct btrfs_root *root,

				   struct extent_buffer *buf)

{

#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

	if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))

	if (btrfs_test_is_dummy_root(root))

		return 0;

#endif



	/* ensure we can see the force_cow */

	smp_rmb();
@@ -4625,8 +4624,7 @@ void btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path, 
				ptr = btrfs_item_ptr_offset(leaf, slot);

				memmove_extent_buffer(leaf, ptr,

				      (unsigned long)fi,

				      offsetof(struct btrfs_file_extent_item,

						 disk_bytenr));

				      BTRFS_FILE_EXTENT_INLINE_DATA_START);

			}

		}

fs/btrfs/ctree.h

+18 −8
Original line number Diff line number Diff line
@@ -385,9 +385,11 @@ struct btrfs_header { 
				     sizeof(struct btrfs_key_ptr))

#define __BTRFS_LEAF_DATA_SIZE(bs) ((bs) - sizeof(struct btrfs_header))

#define BTRFS_LEAF_DATA_SIZE(r) (__BTRFS_LEAF_DATA_SIZE(r->nodesize))

#define BTRFS_FILE_EXTENT_INLINE_DATA_START		\

		(offsetof(struct btrfs_file_extent_item, disk_bytenr))

#define BTRFS_MAX_INLINE_DATA_SIZE(r) (BTRFS_LEAF_DATA_SIZE(r) - \

					sizeof(struct btrfs_item) - \

					offsetof(struct btrfs_file_extent_item, disk_bytenr))

					BTRFS_FILE_EXTENT_INLINE_DATA_START)

#define BTRFS_MAX_XATTR_SIZE(r)	(BTRFS_LEAF_DATA_SIZE(r) - \

				 sizeof(struct btrfs_item) -\

				 sizeof(struct btrfs_dir_item))
@@ -896,6 +898,8 @@ struct btrfs_file_extent_item { 
	/*

	 * disk space consumed by the extent, checksum blocks are included

	 * in these numbers

	 *

	 * At this offset in the structure, the inline extent data start.

	 */

	__le64 disk_bytenr;

	__le64 disk_num_bytes;
@@ -2089,6 +2093,7 @@ struct btrfs_ioctl_defrag_range_args { 
#define	BTRFS_MOUNT_CHANGE_INODE_CACHE	(1 << 24)



#define BTRFS_DEFAULT_COMMIT_INTERVAL	(30)

#define BTRFS_DEFAULT_MAX_INLINE	(8192)



#define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)

#define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)
@@ -3042,14 +3047,12 @@ BTRFS_SETGET_STACK_FUNCS(stack_file_extent_compression, 
static inline unsigned long

btrfs_file_extent_inline_start(struct btrfs_file_extent_item *e)

{

	unsigned long offset = (unsigned long)e;

	offset += offsetof(struct btrfs_file_extent_item, disk_bytenr);

	return offset;

	return (unsigned long)e + BTRFS_FILE_EXTENT_INLINE_DATA_START;

}



static inline u32 btrfs_file_extent_calc_inline_size(u32 datasize)

{

	return offsetof(struct btrfs_file_extent_item, disk_bytenr) + datasize;

	return BTRFS_FILE_EXTENT_INLINE_DATA_START + datasize;

}



BTRFS_SETGET_FUNCS(file_extent_disk_bytenr, struct btrfs_file_extent_item,
@@ -3079,9 +3082,7 @@ BTRFS_SETGET_FUNCS(file_extent_other_encoding, struct btrfs_file_extent_item, 
static inline u32 btrfs_file_extent_inline_item_len(struct extent_buffer *eb,

						    struct btrfs_item *e)

{

	unsigned long offset;

	offset = offsetof(struct btrfs_file_extent_item, disk_bytenr);

	return btrfs_item_size(eb, e) - offset;

	return btrfs_item_size(eb, e) - BTRFS_FILE_EXTENT_INLINE_DATA_START;

}



/* this returns the number of file bytes represented by the inline item.
@@ -4128,4 +4129,13 @@ static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info) 
void btrfs_test_destroy_inode(struct inode *inode);

#endif



static inline int btrfs_test_is_dummy_root(struct btrfs_root *root)

{

#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

	if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))

		return 1;

#endif

	return 0;

}



#endif

fs/btrfs/disk-io.c

+35 −26
Original line number Diff line number Diff line
@@ -72,21 +72,41 @@ static int btrfs_cleanup_transaction(struct btrfs_root *root); 
static void btrfs_error_commit_super(struct btrfs_root *root);



/*

 * end_io_wq structs are used to do processing in task context when an IO is

 * complete.  This is used during reads to verify checksums, and it is used

 * btrfs_end_io_wq structs are used to do processing in task context when an IO

 * is complete.  This is used during reads to verify checksums, and it is used

 * by writes to insert metadata for new file extents after IO is complete.

 */

struct end_io_wq {

struct btrfs_end_io_wq {

	struct bio *bio;

	bio_end_io_t *end_io;

	void *private;

	struct btrfs_fs_info *info;

	int error;

	int metadata;

	enum btrfs_wq_endio_type metadata;

	struct list_head list;

	struct btrfs_work work;

};



static struct kmem_cache *btrfs_end_io_wq_cache;



int __init btrfs_end_io_wq_init(void)

{

	btrfs_end_io_wq_cache = kmem_cache_create("btrfs_end_io_wq",

					sizeof(struct btrfs_end_io_wq),

					0,

					SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD,

					NULL);

	if (!btrfs_end_io_wq_cache)

		return -ENOMEM;

	return 0;

}



void btrfs_end_io_wq_exit(void)

{

	if (btrfs_end_io_wq_cache)

		kmem_cache_destroy(btrfs_end_io_wq_cache);

}



/*

 * async submit bios are used to offload expensive checksumming

 * onto the worker threads.  They checksum file and metadata bios
@@ -327,8 +347,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree, 
{

	struct extent_state *cached_state = NULL;

	int ret;

	bool need_lock = (current->journal_info ==

			  (void *)BTRFS_SEND_TRANS_STUB);

	bool need_lock = (current->journal_info == BTRFS_SEND_TRANS_STUB);



	if (!parent_transid || btrfs_header_generation(eb) == parent_transid)

		return 0;
@@ -690,7 +709,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror) 


static void end_workqueue_bio(struct bio *bio, int err)

{

	struct end_io_wq *end_io_wq = bio->bi_private;

	struct btrfs_end_io_wq *end_io_wq = bio->bi_private;

	struct btrfs_fs_info *fs_info;

	struct btrfs_workqueue *wq;

	btrfs_work_func_t func;
@@ -733,20 +752,12 @@ static void end_workqueue_bio(struct bio *bio, int err) 
	btrfs_queue_work(wq, &end_io_wq->work);

}



/*

 * For the metadata arg you want

 *

 * 0 - if data

 * 1 - if normal metadta

 * 2 - if writing to the free space cache area

 * 3 - raid parity work

 */

int btrfs_bio_wq_end_io(struct btrfs_fs_info *info, struct bio *bio,

			int metadata)

			enum btrfs_wq_endio_type metadata)

{

	struct end_io_wq *end_io_wq;

	struct btrfs_end_io_wq *end_io_wq;



	end_io_wq = kmalloc(sizeof(*end_io_wq), GFP_NOFS);

	end_io_wq = kmem_cache_alloc(btrfs_end_io_wq_cache, GFP_NOFS);

	if (!end_io_wq)

		return -ENOMEM;
@@ -930,7 +941,7 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio, 
		 * can happen in the async kernel threads

		 */

		ret = btrfs_bio_wq_end_io(BTRFS_I(inode)->root->fs_info,

					  bio, 1);

					  bio, BTRFS_WQ_ENDIO_METADATA);

		if (ret)

			goto out_w_error;

		ret = btrfs_map_bio(BTRFS_I(inode)->root, rw, bio,
@@ -1119,11 +1130,9 @@ struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root, 
struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,

						 u64 bytenr, u32 blocksize)

{

#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

	if (unlikely(test_bit(BTRFS_ROOT_DUMMY_ROOT, &root->state)))

	if (btrfs_test_is_dummy_root(root))

		return alloc_test_extent_buffer(root->fs_info, bytenr,

						blocksize);

#endif

	return alloc_extent_buffer(root->fs_info, bytenr, blocksize);

}
@@ -1731,16 +1740,16 @@ static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi) 
static void end_workqueue_fn(struct btrfs_work *work)

{

	struct bio *bio;

	struct end_io_wq *end_io_wq;

	struct btrfs_end_io_wq *end_io_wq;

	int error;



	end_io_wq = container_of(work, struct end_io_wq, work);

	end_io_wq = container_of(work, struct btrfs_end_io_wq, work);

	bio = end_io_wq->bio;



	error = end_io_wq->error;

	bio->bi_private = end_io_wq->private;

	bio->bi_end_io = end_io_wq->end_io;

	kfree(end_io_wq);

	kmem_cache_free(btrfs_end_io_wq_cache, end_io_wq);

	bio_endio_nodec(bio, error);

}
@@ -2260,7 +2269,7 @@ int open_ctree(struct super_block *sb, 
	atomic_set(&fs_info->qgroup_op_seq, 0);

	atomic64_set(&fs_info->tree_mod_seq, 0);

	fs_info->sb = sb;

	fs_info->max_inline = 8192 * 1024;

	fs_info->max_inline = BTRFS_DEFAULT_MAX_INLINE;

	fs_info->metadata_ratio = 0;

	fs_info->defrag_inodes = RB_ROOT;

	fs_info->free_chunk_space = 0;

fs/btrfs/disk-io.h

+4 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#define BTRFS_SUPER_MIRROR_MAX	 3

#define BTRFS_SUPER_MIRROR_SHIFT 12



enum {

enum btrfs_wq_endio_type {

	BTRFS_WQ_ENDIO_DATA = 0,

	BTRFS_WQ_ENDIO_METADATA = 1,

	BTRFS_WQ_ENDIO_FREE_SPACE = 2,
@@ -120,7 +120,7 @@ int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid); 
u32 btrfs_csum_data(char *data, u32 seed, size_t len);

void btrfs_csum_final(u32 crc, char *result);

int btrfs_bio_wq_end_io(struct btrfs_fs_info *info, struct bio *bio,

			int metadata);

			enum btrfs_wq_endio_type metadata);

int btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct inode *inode,

			int rw, struct bio *bio, int mirror_num,

			unsigned long bio_flags, u64 bio_offset,
@@ -142,6 +142,8 @@ int btree_lock_page_hook(struct page *page, void *data, 
				void (*flush_fn)(void *));

int btrfs_calc_num_tolerated_disk_barrier_failures(

	struct btrfs_fs_info *fs_info);

int __init btrfs_end_io_wq_init(void);

void btrfs_end_io_wq_exit(void);



#ifdef CONFIG_DEBUG_LOCK_ALLOC

void btrfs_init_lockdep(void);