Commit 441f4058 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (30 commits)
  Btrfs: fix the inode ref searches done by btrfs_search_path_in_tree
  Btrfs: allow treeid==0 in the inode lookup ioctl
  Btrfs: return keys for large items to the search ioctl
  Btrfs: fix key checks and advance in the search ioctl
  Btrfs: buffer results in the space_info ioctl
  Btrfs: use __u64 types in ioctl.h
  Btrfs: fix search_ioctl key advance
  Btrfs: fix gfp flags masking in the compression code
  Btrfs: don't look at bio flags after submit_bio
  btrfs: using btrfs_stack_device_id() get devid
  btrfs: use memparse
  Btrfs: add a "df" ioctl for btrfs
  Btrfs: cache the extent state everywhere we possibly can V2
  Btrfs: cache ordered extent when completing io
  Btrfs: cache extent state in find_delalloc_range
  Btrfs: change the ordered tree to use a spinlock instead of a mutex
  Btrfs: finish read pages in the order they are submitted
  btrfs: fix btrfs_mkdir goto for no free objectids
  Btrfs: flush data on snapshot creation
  Btrfs: make df be a little bit more understandable
  ...
parents 7c34691a 8ad6fcab

fs/btrfs/btrfs_inode.h

+5 −0
Original line number Diff line number Diff line
@@ -153,6 +153,11 @@ struct btrfs_inode { 
	unsigned ordered_data_close:1;

	unsigned dummy_inode:1;



	/*

	 * always compress this one file

	 */

	unsigned force_compress:1;



	struct inode vfs_inode;

};

fs/btrfs/compression.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, 
			goto next;

		}



		page = alloc_page(mapping_gfp_mask(mapping) | GFP_NOFS);

		page = alloc_page(mapping_gfp_mask(mapping) & ~__GFP_FS);

		if (!page)

			break;

fs/btrfs/ctree.h

+7 −6
Original line number Diff line number Diff line
@@ -373,11 +373,13 @@ struct btrfs_super_block { 
 * ones specified below then we will fail to mount

 */

#define BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF	(1ULL << 0)

#define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL	(2ULL << 0)



#define BTRFS_FEATURE_COMPAT_SUPP		0ULL

#define BTRFS_FEATURE_COMPAT_RO_SUPP		0ULL

#define BTRFS_FEATURE_INCOMPAT_SUPP		\

	BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF

	(BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF |	\

	 BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL)



/*

 * A leaf is full of items. offset and size tell us where to find
@@ -1182,7 +1184,6 @@ struct btrfs_root { 
#define BTRFS_INODE_NOATIME		(1 << 9)

#define BTRFS_INODE_DIRSYNC		(1 << 10)





/* some macros to generate set/get funcs for the struct fields.  This

 * assumes there is a lefoo_to_cpu for every type, so lets make a simple

 * one for u8:
@@ -1842,7 +1843,7 @@ BTRFS_SETGET_STACK_FUNCS(super_num_devices, struct btrfs_super_block, 
BTRFS_SETGET_STACK_FUNCS(super_compat_flags, struct btrfs_super_block,

			 compat_flags, 64);

BTRFS_SETGET_STACK_FUNCS(super_compat_ro_flags, struct btrfs_super_block,

			 compat_flags, 64);

			 compat_ro_flags, 64);

BTRFS_SETGET_STACK_FUNCS(super_incompat_flags, struct btrfs_super_block,

			 incompat_flags, 64);

BTRFS_SETGET_STACK_FUNCS(super_csum_type, struct btrfs_super_block,
@@ -2310,7 +2311,8 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 
			       u32 min_type);



int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput);

int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end);

int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end,

			      struct extent_state **cached_state);

int btrfs_writepages(struct address_space *mapping,

		     struct writeback_control *wbc);

int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
@@ -2335,7 +2337,7 @@ int btrfs_init_cachep(void); 
void btrfs_destroy_cachep(void);

long btrfs_ioctl_trans_end(struct file *file);

struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,

			 struct btrfs_root *root);

			 struct btrfs_root *root, int *was_new);

int btrfs_commit_write(struct file *file, struct page *page,

		       unsigned from, unsigned to);

struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
@@ -2386,7 +2388,6 @@ void btrfs_sysfs_del_super(struct btrfs_fs_info *root); 
ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);



/* super.c */

u64 btrfs_parse_size(char *str);

int btrfs_parse_options(struct btrfs_root *root, char *options);

int btrfs_sync_fs(struct super_block *sb, int wait);

fs/btrfs/disk-io.c

+9 −6
Original line number Diff line number Diff line
@@ -263,13 +263,15 @@ static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf, 
static int verify_parent_transid(struct extent_io_tree *io_tree,

				 struct extent_buffer *eb, u64 parent_transid)

{

	struct extent_state *cached_state = NULL;

	int ret;



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

		return 0;



	lock_extent(io_tree, eb->start, eb->start + eb->len - 1, GFP_NOFS);

	if (extent_buffer_uptodate(io_tree, eb) &&

	lock_extent_bits(io_tree, eb->start, eb->start + eb->len - 1,

			 0, &cached_state, GFP_NOFS);

	if (extent_buffer_uptodate(io_tree, eb, cached_state) &&

	    btrfs_header_generation(eb) == parent_transid) {

		ret = 0;

		goto out;
@@ -282,10 +284,10 @@ static int verify_parent_transid(struct extent_io_tree *io_tree, 
		       (unsigned long long)btrfs_header_generation(eb));

	}

	ret = 1;

	clear_extent_buffer_uptodate(io_tree, eb);

	clear_extent_buffer_uptodate(io_tree, eb, &cached_state);

out:

	unlock_extent(io_tree, eb->start, eb->start + eb->len - 1,

		      GFP_NOFS);

	unlock_extent_cached(io_tree, eb->start, eb->start + eb->len - 1,

			     &cached_state, GFP_NOFS);

	return ret;

}
@@ -2497,7 +2499,8 @@ int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid) 
	int ret;

	struct inode *btree_inode = buf->first_page->mapping->host;



	ret = extent_buffer_uptodate(&BTRFS_I(btree_inode)->io_tree, buf);

	ret = extent_buffer_uptodate(&BTRFS_I(btree_inode)->io_tree, buf,

				     NULL);

	if (!ret)

		return ret;

fs/btrfs/export.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, 
	btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);

	key.offset = 0;



	inode = btrfs_iget(sb, &key, root);

	inode = btrfs_iget(sb, &key, root, NULL);

	if (IS_ERR(inode)) {

		err = PTR_ERR(inode);

		goto fail;
@@ -223,7 +223,7 @@ static struct dentry *btrfs_get_parent(struct dentry *child) 


	key.type = BTRFS_INODE_ITEM_KEY;

	key.offset = 0;

	dentry = d_obtain_alias(btrfs_iget(root->fs_info->sb, &key, root));

	dentry = d_obtain_alias(btrfs_iget(root->fs_info->sb, &key, root, NULL));

	if (!IS_ERR(dentry))

		dentry->d_op = &btrfs_dentry_operations;

	return dentry;

CRA Git | Maintained and supported by SUSTech CRA and CCSE