Commit a0c30610 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/btrfs-unstable 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (58 commits)
  Btrfs: use the device_list_mutex during write_dev_supers
  Btrfs: setup free ino caching in a more asynchronous way
  btrfs scrub: don't coalesce pages that are logically discontiguous
  Btrfs: return -ENOMEM in clear_extent_bit
  Btrfs: add mount -o auto_defrag
  Btrfs: using rcu lock in the reader side of devices list
  Btrfs: drop unnecessary device lock
  Btrfs: fix the race between remove dev and alloc chunk
  Btrfs: fix the race between reading and updating devices
  Btrfs: fix bh leak on __btrfs_open_devices path
  Btrfs: fix unsafe usage of merge_state
  Btrfs: allocate extent state and check the result properly
  fs/btrfs: Add missing btrfs_free_path
  Btrfs: check return value of btrfs_inc_extent_ref()
  Btrfs: return error to caller if read_one_inode() fails
  Btrfs: BUG_ON is deleted from the caller of btrfs_truncate_item & btrfs_extend_item
  Btrfs: return error code to caller when btrfs_del_item fails
  Btrfs: return error code to caller when btrfs_previous_item fails
  btrfs: fix typo 'testeing' -> 'testing'
  btrfs: typo: 'btrfS' -> 'btrfs'
  ...
parents 10799db6 174ba509

fs/btrfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \

	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \

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

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

fs/btrfs/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ int btrfs_acl_chmod(struct inode *inode) 
		return 0;



	acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS);

	if (IS_ERR(acl) || !acl)

	if (IS_ERR_OR_NULL(acl))

		return PTR_ERR(acl);



	clone = posix_acl_clone(acl, GFP_KERNEL);

fs/btrfs/btrfs_inode.h

+15 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "extent_map.h"

#include "extent_io.h"

#include "ordered-data.h"

#include "delayed-inode.h"



/* in memory btrfs inode */

struct btrfs_inode {
@@ -152,20 +153,34 @@ struct btrfs_inode { 
	unsigned ordered_data_close:1;

	unsigned orphan_meta_reserved:1;

	unsigned dummy_inode:1;

	unsigned in_defrag:1;



	/*

	 * always compress this one file

	 */

	unsigned force_compress:4;



	struct btrfs_delayed_node *delayed_node;



	struct inode vfs_inode;

};



extern unsigned char btrfs_filetype_table[];



static inline struct btrfs_inode *BTRFS_I(struct inode *inode)

{

	return container_of(inode, struct btrfs_inode, vfs_inode);

}



static inline u64 btrfs_ino(struct inode *inode)

{

	u64 ino = BTRFS_I(inode)->location.objectid;



	if (ino <= BTRFS_FIRST_FREE_OBJECTID)

		ino = inode->i_ino;

	return ino;

}



static inline void btrfs_i_size_write(struct inode *inode, u64 size)

{

	i_size_write(inode, size);

fs/btrfs/compression.c

+24 −23
Original line number Diff line number Diff line
@@ -125,9 +125,10 @@ static int check_compressed_csum(struct inode *inode, 
		kunmap_atomic(kaddr, KM_USER0);



		if (csum != *cb_sum) {

			printk(KERN_INFO "btrfs csum failed ino %lu "

			printk(KERN_INFO "btrfs csum failed ino %llu "

			       "extent %llu csum %u "

			       "wanted %u mirror %d\n", inode->i_ino,

			       "wanted %u mirror %d\n",

			       (unsigned long long)btrfs_ino(inode),

			       (unsigned long long)disk_start,

			       csum, *cb_sum, cb->mirror_num);

			ret = -EIO;
@@ -332,7 +333,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	struct compressed_bio *cb;

	unsigned long bytes_left;

	struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;

	int page_index = 0;

	int pg_index = 0;

	struct page *page;

	u64 first_byte = disk_start;

	struct block_device *bdev;
@@ -366,8 +367,8 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 


	/* create and submit bios for the compressed pages */

	bytes_left = compressed_len;

	for (page_index = 0; page_index < cb->nr_pages; page_index++) {

		page = compressed_pages[page_index];

	for (pg_index = 0; pg_index < cb->nr_pages; pg_index++) {

		page = compressed_pages[pg_index];

		page->mapping = inode->i_mapping;

		if (bio->bi_size)

			ret = io_tree->ops->merge_bio_hook(page, 0,
@@ -432,7 +433,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, 
				     struct compressed_bio *cb)

{

	unsigned long end_index;

	unsigned long page_index;

	unsigned long pg_index;

	u64 last_offset;

	u64 isize = i_size_read(inode);

	int ret;
@@ -456,13 +457,13 @@ static noinline int add_ra_bio_pages(struct inode *inode, 
	end_index = (i_size_read(inode) - 1) >> PAGE_CACHE_SHIFT;



	while (last_offset < compressed_end) {

		page_index = last_offset >> PAGE_CACHE_SHIFT;

		pg_index = last_offset >> PAGE_CACHE_SHIFT;



		if (page_index > end_index)

		if (pg_index > end_index)

			break;



		rcu_read_lock();

		page = radix_tree_lookup(&mapping->page_tree, page_index);

		page = radix_tree_lookup(&mapping->page_tree, pg_index);

		rcu_read_unlock();

		if (page) {

			misses++;
@@ -476,7 +477,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, 
		if (!page)

			break;



		if (add_to_page_cache_lru(page, mapping, page_index,

		if (add_to_page_cache_lru(page, mapping, pg_index,

								GFP_NOFS)) {

			page_cache_release(page);

			goto next;
@@ -560,7 +561,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	unsigned long uncompressed_len = bio->bi_vcnt * PAGE_CACHE_SIZE;

	unsigned long compressed_len;

	unsigned long nr_pages;

	unsigned long page_index;

	unsigned long pg_index;

	struct page *page;

	struct block_device *bdev;

	struct bio *comp_bio;
@@ -613,10 +614,10 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 


	bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;



	for (page_index = 0; page_index < nr_pages; page_index++) {

		cb->compressed_pages[page_index] = alloc_page(GFP_NOFS |

	for (pg_index = 0; pg_index < nr_pages; pg_index++) {

		cb->compressed_pages[pg_index] = alloc_page(GFP_NOFS |

							      __GFP_HIGHMEM);

		if (!cb->compressed_pages[page_index])

		if (!cb->compressed_pages[pg_index])

			goto fail2;

	}

	cb->nr_pages = nr_pages;
@@ -634,8 +635,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	comp_bio->bi_end_io = end_compressed_bio_read;

	atomic_inc(&cb->pending_bios);



	for (page_index = 0; page_index < nr_pages; page_index++) {

		page = cb->compressed_pages[page_index];

	for (pg_index = 0; pg_index < nr_pages; pg_index++) {

		page = cb->compressed_pages[pg_index];

		page->mapping = inode->i_mapping;

		page->index = em_start >> PAGE_CACHE_SHIFT;
@@ -702,8 +703,8 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	return 0;



fail2:

	for (page_index = 0; page_index < nr_pages; page_index++)

		free_page((unsigned long)cb->compressed_pages[page_index]);

	for (pg_index = 0; pg_index < nr_pages; pg_index++)

		free_page((unsigned long)cb->compressed_pages[pg_index]);



	kfree(cb->compressed_pages);

fail1:
@@ -945,7 +946,7 @@ void btrfs_exit_compress(void) 
int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,

			      unsigned long total_out, u64 disk_start,

			      struct bio_vec *bvec, int vcnt,

			      unsigned long *page_index,

			      unsigned long *pg_index,

			      unsigned long *pg_offset)

{

	unsigned long buf_offset;
@@ -954,7 +955,7 @@ int btrfs_decompress_buf2page(char *buf, unsigned long buf_start, 
	unsigned long working_bytes = total_out - buf_start;

	unsigned long bytes;

	char *kaddr;

	struct page *page_out = bvec[*page_index].bv_page;

	struct page *page_out = bvec[*pg_index].bv_page;



	/*

	 * start byte is the first byte of the page we're currently
@@ -995,11 +996,11 @@ int btrfs_decompress_buf2page(char *buf, unsigned long buf_start, 


		/* check if we need to pick another page */

		if (*pg_offset == PAGE_CACHE_SIZE) {

			(*page_index)++;

			if (*page_index >= vcnt)

			(*pg_index)++;

			if (*pg_index >= vcnt)

				return 0;



			page_out = bvec[*page_index].bv_page;

			page_out = bvec[*pg_index].bv_page;

			*pg_offset = 0;

			start_byte = page_offset(page_out) - disk_start;

fs/btrfs/compression.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int btrfs_decompress(int type, unsigned char *data_in, struct page *dest_page, 
int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,

			      unsigned long total_out, u64 disk_start,

			      struct bio_vec *bvec, int vcnt,

			      unsigned long *page_index,

			      unsigned long *pg_index,

			      unsigned long *pg_offset);



int btrfs_submit_compressed_write(struct inode *inode, u64 start,

CRA Git | Maintained and supported by SUSTech CRA and CCSE