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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable 

Fix fs/btrfs/super.c conflict around #includes
parents 18e352e4 a7175319

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -1021,6 +1021,14 @@ M: mb@bu3sch.de 
W:	http://bu3sch.de/btgpio.php

S:	Maintained



BTRFS FILE SYSTEM

P:	Chris Mason

M:	chris.mason@oracle.com

L:	linux-btrfs@vger.kernel.org

W:	http://btrfs.wiki.kernel.org/

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

S:	Maintained



BTTV VIDEO4LINUX DRIVER

P:	Mauro Carvalho Chehab

M:	mchehab@infradead.org

fs/btrfs/async-thread.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
 * Boston, MA 021110-1307, USA.

 */



#include <linux/version.h>

#include <linux/kthread.h>

#include <linux/list.h>

#include <linux/spinlock.h>

fs/btrfs/compression.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/swap.h>

#include <linux/writeback.h>

#include <linux/bit_spinlock.h>

#include <linux/version.h>

#include <linux/pagevec.h>

#include "compat.h"

#include "ctree.h"

fs/btrfs/ctree.c

+5 −16
Original line number Diff line number Diff line
@@ -1210,8 +1210,7 @@ static noinline void reada_for_search(struct btrfs_root *root, 
	struct btrfs_disk_key disk_key;

	u32 nritems;

	u64 search;

	u64 lowest_read;

	u64 highest_read;

	u64 target;

	u64 nread = 0;

	int direction = path->reada;

	struct extent_buffer *eb;
@@ -1235,8 +1234,7 @@ static noinline void reada_for_search(struct btrfs_root *root, 
		return;

	}



	highest_read = search;

	lowest_read = search;

	target = search;



	nritems = btrfs_header_nritems(node);

	nr = slot;
@@ -1256,24 +1254,15 @@ static noinline void reada_for_search(struct btrfs_root *root, 
				break;

		}

		search = btrfs_node_blockptr(node, nr);

		if ((search >= lowest_read && search <= highest_read) ||

		    (search < lowest_read && lowest_read - search <= 16384) ||

		    (search > highest_read && search - highest_read <= 16384)) {

		if ((search <= target && target - search <= 65536) ||

		    (search > target && search - target <= 65536)) {

			readahead_tree_block(root, search, blocksize,

				     btrfs_node_ptr_generation(node, nr));

			nread += blocksize;

		}

		nscan++;

		if (path->reada < 2 && (nread > (64 * 1024) || nscan > 32))

		if ((nread > 65536 || nscan > 32))

			break;



		if (nread > (256 * 1024) || nscan > 128)

			break;



		if (search < lowest_read)

			lowest_read = search;

		if (search > highest_read)

			highest_read = search;

	}

}

fs/btrfs/ctree.h

+9 −14
Original line number Diff line number Diff line
@@ -454,17 +454,11 @@ struct btrfs_timespec { 
	__le32 nsec;

} __attribute__ ((__packed__));



typedef enum {

enum btrfs_compression_type {

	BTRFS_COMPRESS_NONE = 0,

	BTRFS_COMPRESS_ZLIB = 1,

	BTRFS_COMPRESS_LAST = 2,

} btrfs_compression_type;



/* we don't understand any encryption methods right now */

typedef enum {

	BTRFS_ENCRYPTION_NONE = 0,

	BTRFS_ENCRYPTION_LAST = 1,

} btrfs_encryption_type;

};



struct btrfs_inode_item {

	/* nfs style generation number */
@@ -701,9 +695,7 @@ struct btrfs_fs_info { 
	struct btrfs_transaction *running_transaction;

	wait_queue_head_t transaction_throttle;

	wait_queue_head_t transaction_wait;



	wait_queue_head_t async_submit_wait;

	wait_queue_head_t tree_log_wait;



	struct btrfs_super_block super_copy;

	struct btrfs_super_block super_for_commit;
@@ -730,10 +722,6 @@ struct btrfs_fs_info { 
	atomic_t async_submit_draining;

	atomic_t nr_async_bios;

	atomic_t async_delalloc_pages;

	atomic_t tree_log_writers;

	atomic_t tree_log_commit;

	unsigned long tree_log_batch;

	u64 tree_log_transid;



	/*

	 * this is used by the balancing code to wait for all the pending
@@ -833,7 +821,14 @@ struct btrfs_root { 
	struct kobject root_kobj;

	struct completion kobj_unregister;

	struct mutex objectid_mutex;



	struct mutex log_mutex;

	wait_queue_head_t log_writer_wait;

	wait_queue_head_t log_commit_wait[2];

	atomic_t log_writers;

	atomic_t log_commit[2];

	unsigned long log_transid;

	unsigned long log_batch;



	u64 objectid;

	u64 last_trans;