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

Merge branch 'raid56-experimental' into for-linus-3.9 



Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>

Conflicts:
	fs/btrfs/ctree.h
	fs/btrfs/extent-tree.c
	fs/btrfs/inode.c
	fs/btrfs/volumes.c
parents b2c6b3e0 0e4e0263

fs/btrfs/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ config BTRFS_FS 
	select ZLIB_DEFLATE

	select LZO_COMPRESS

	select LZO_DECOMPRESS

	select RAID6_PQ

	select XOR_BLOCKS



	help

	  Btrfs is a new filesystem with extents, writable snapshotting,

	  support for multiple devices and many more features.

fs/btrfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \

	   export.o tree-log.o free-space-cache.o zlib.o lzo.o \

	   compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \

	   reada.o backref.o ulist.o qgroup.o send.o dev-replace.o

	   reada.o backref.o ulist.o qgroup.o send.o dev-replace.o raid56.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o

fs/btrfs/compression.c

+2 −2
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
		page = compressed_pages[pg_index];

		page->mapping = inode->i_mapping;

		if (bio->bi_size)

			ret = io_tree->ops->merge_bio_hook(page, 0,

			ret = io_tree->ops->merge_bio_hook(WRITE, page, 0,

							   PAGE_CACHE_SIZE,

							   bio, 0);

		else
@@ -655,7 +655,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
		page->index = em_start >> PAGE_CACHE_SHIFT;



		if (comp_bio->bi_size)

			ret = tree->ops->merge_bio_hook(page, 0,

			ret = tree->ops->merge_bio_hook(READ, page, 0,

							PAGE_CACHE_SIZE,

							comp_bio, 0);

		else

fs/btrfs/ctree.h

+41 −3
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ struct btrfs_super_block { 
#define BTRFS_FEATURE_INCOMPAT_BIG_METADATA	(1ULL << 5)



#define BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF	(1ULL << 6)

#define BTRFS_FEATURE_INCOMPAT_RAID56		(1ULL << 7)



#define BTRFS_FEATURE_COMPAT_SUPP		0ULL

#define BTRFS_FEATURE_COMPAT_RO_SUPP		0ULL
@@ -515,6 +516,7 @@ struct btrfs_super_block { 
	 BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS |		\

	 BTRFS_FEATURE_INCOMPAT_BIG_METADATA |		\

	 BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO |		\

	 BTRFS_FEATURE_INCOMPAT_RAID56 |		\

	 BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF)



/*
@@ -956,6 +958,8 @@ struct btrfs_dev_replace_item { 
#define BTRFS_BLOCK_GROUP_RAID1		(1ULL << 4)

#define BTRFS_BLOCK_GROUP_DUP		(1ULL << 5)

#define BTRFS_BLOCK_GROUP_RAID10	(1ULL << 6)

#define BTRFS_BLOCK_GROUP_RAID5    (1 << 7)

#define BTRFS_BLOCK_GROUP_RAID6    (1 << 8)

#define BTRFS_BLOCK_GROUP_RESERVED	BTRFS_AVAIL_ALLOC_BIT_SINGLE



enum btrfs_raid_types {
@@ -964,6 +968,8 @@ enum btrfs_raid_types { 
	BTRFS_RAID_DUP,

	BTRFS_RAID_RAID0,

	BTRFS_RAID_SINGLE,

	BTRFS_RAID_RAID5,

	BTRFS_RAID_RAID6,

	BTRFS_NR_RAID_TYPES

};
@@ -973,6 +979,8 @@ enum btrfs_raid_types { 


#define BTRFS_BLOCK_GROUP_PROFILE_MASK	(BTRFS_BLOCK_GROUP_RAID0 |   \

					 BTRFS_BLOCK_GROUP_RAID1 |   \

					 BTRFS_BLOCK_GROUP_RAID5 |   \

					 BTRFS_BLOCK_GROUP_RAID6 |   \

					 BTRFS_BLOCK_GROUP_DUP |     \

					 BTRFS_BLOCK_GROUP_RAID10)

/*
@@ -1197,6 +1205,10 @@ struct btrfs_block_group_cache { 
	u64 flags;

	u64 sectorsize;

	u64 cache_generation;



	/* for raid56, this is a full stripe, without parity */

	unsigned long full_stripe_len;



	unsigned int ro:1;

	unsigned int dirty:1;

	unsigned int iref:1;
@@ -1242,6 +1254,23 @@ enum btrfs_orphan_cleanup_state { 
	ORPHAN_CLEANUP_DONE	= 2,

};



/* used by the raid56 code to lock stripes for read/modify/write */

struct btrfs_stripe_hash {

	struct list_head hash_list;

	wait_queue_head_t wait;

	spinlock_t lock;

};



/* used by the raid56 code to lock stripes for read/modify/write */

struct btrfs_stripe_hash_table {

	struct list_head stripe_cache;

	spinlock_t cache_lock;

	int cache_size;

	struct btrfs_stripe_hash table[];

};



#define BTRFS_STRIPE_HASH_TABLE_BITS 11



/* fs_info */

struct reloc_control;

struct btrfs_device;
@@ -1341,6 +1370,13 @@ struct btrfs_fs_info { 
	struct mutex cleaner_mutex;

	struct mutex chunk_mutex;

	struct mutex volume_mutex;



	/* this is used during read/modify/write to make sure

	 * no two ios are trying to mod the same stripe at the same

	 * time

	 */

	struct btrfs_stripe_hash_table *stripe_hash_table;



	/*

	 * this protects the ordered operations list only while we are

	 * processing all of the entries on it.  This way we make
@@ -1423,6 +1459,8 @@ struct btrfs_fs_info { 
	struct btrfs_workers flush_workers;

	struct btrfs_workers endio_workers;

	struct btrfs_workers endio_meta_workers;

	struct btrfs_workers endio_raid56_workers;

	struct btrfs_workers rmw_workers;

	struct btrfs_workers endio_meta_write_workers;

	struct btrfs_workers endio_write_workers;

	struct btrfs_workers endio_freespace_worker;
@@ -3490,9 +3528,9 @@ int btrfs_writepages(struct address_space *mapping, 
		     struct writeback_control *wbc);

int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,

			     struct btrfs_root *new_root, u64 new_dirid);

int btrfs_merge_bio_hook(struct page *page, unsigned long offset,

			 size_t size, struct bio *bio, unsigned long bio_flags);



int btrfs_merge_bio_hook(int rw, struct page *page, unsigned long offset,

			 size_t size, struct bio *bio,

			 unsigned long bio_flags);

int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);

int btrfs_readpage(struct file *file, struct page *page);

void btrfs_evict_inode(struct inode *inode);

fs/btrfs/delayed-ref.h

+9 −0
Original line number Diff line number Diff line
@@ -131,6 +131,15 @@ struct btrfs_delayed_ref_root { 
	/* total number of head nodes ready for processing */

	unsigned long num_heads_ready;



	/*

	 * bumped when someone is making progress on the delayed

	 * refs, so that other procs know they are just adding to

	 * contention intead of helping

	 */

	atomic_t procs_running_refs;

	atomic_t ref_seq;

	wait_queue_head_t wait;



	/*

	 * set when the tree is flushing before a transaction commit,

	 * used by the throttling code to decide if new updates need