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

Commit ed8f3737 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: (31 commits)
  Btrfs: don't call writepages from within write_full_page
  Btrfs: Remove unused variable 'last_index' in file.c
  Btrfs: clean up for find_first_extent_bit()
  Btrfs: clean up for wait_extent_bit()
  Btrfs: clean up for insert_state()
  Btrfs: remove unused members from struct extent_state
  Btrfs: clean up code for merging extent maps
  Btrfs: clean up code for extent_map lookup
  Btrfs: clean up search_extent_mapping()
  Btrfs: remove redundant code for dir item lookup
  Btrfs: make acl functions really no-op if acl is not enabled
  Btrfs: remove remaining ref-cache code
  Btrfs: remove a BUG_ON() in btrfs_commit_transaction()
  Btrfs: use wait_event()
  Btrfs: check the nodatasum flag when writing compressed files
  Btrfs: copy string correctly in INO_LOOKUP ioctl
  Btrfs: don't print the leaf if we had an error
  btrfs: make btrfs_set_root_node void
  Btrfs: fix oops while writing data to SSD partitions
  Btrfs: Protect the readonly flag of block group
  ...

Fix up trivial conflicts (due to acl and writeback cleanups) in
 - fs/btrfs/acl.c
 - fs/btrfs/ctree.h
 - fs/btrfs/extent_io.c
parents a6b11f53 0d10ee2e

fs/btrfs/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -6,5 +6,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   transaction.o inode.o file.o tree-defrag.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 \

	   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



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

fs/btrfs/acl.c

+0 −17
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include "btrfs_inode.h"

#include "xattr.h"



#ifdef CONFIG_BTRFS_FS_POSIX_ACL



struct posix_acl *btrfs_get_acl(struct inode *inode, int type)

{

	int size;
@@ -276,18 +274,3 @@ const struct xattr_handler btrfs_xattr_acl_access_handler = { 
	.get	= btrfs_xattr_acl_get,

	.set	= btrfs_xattr_acl_set,

};
 


#else /* CONFIG_BTRFS_FS_POSIX_ACL */



int btrfs_acl_chmod(struct inode *inode)

{

	return 0;

}



int btrfs_init_acl(struct btrfs_trans_handle *trans,

		   struct inode *inode, struct inode *dir)

{

	return 0;

}



#endif /* CONFIG_BTRFS_FS_POSIX_ACL */

fs/btrfs/compression.c

+10 −4
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	u64 first_byte = disk_start;

	struct block_device *bdev;

	int ret;

	int skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;



	WARN_ON(start & ((u64)PAGE_CACHE_SIZE - 1));

	cb = kmalloc(compressed_bio_size(root, compressed_len), GFP_NOFS);
@@ -392,8 +393,11 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
			ret = btrfs_bio_wq_end_io(root->fs_info, bio, 0);

			BUG_ON(ret);



			ret = btrfs_csum_one_bio(root, inode, bio, start, 1);

			if (!skip_sum) {

				ret = btrfs_csum_one_bio(root, inode, bio,

							 start, 1);

				BUG_ON(ret);

			}



			ret = btrfs_map_bio(root, WRITE, bio, 0, 1);

			BUG_ON(ret);
@@ -418,8 +422,10 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	ret = btrfs_bio_wq_end_io(root->fs_info, bio, 0);

	BUG_ON(ret);



	if (!skip_sum) {

		ret = btrfs_csum_one_bio(root, inode, bio, start, 1);

		BUG_ON(ret);

	}



	ret = btrfs_map_bio(root, WRITE, bio, 0, 1);

	BUG_ON(ret);

fs/btrfs/ctree.h

+22 −8
Original line number Diff line number Diff line
@@ -2406,7 +2406,7 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, struct 
			 btrfs_root_item *item, struct btrfs_key *key);

int btrfs_find_dead_roots(struct btrfs_root *root, u64 objectid);

int btrfs_find_orphan_roots(struct btrfs_root *tree_root);

int btrfs_set_root_node(struct btrfs_root_item *item,

void btrfs_set_root_node(struct btrfs_root_item *item,

			 struct extent_buffer *node);

void btrfs_check_and_init_root_item(struct btrfs_root_item *item);
@@ -2523,6 +2523,14 @@ struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *pag 
#define PageChecked PageFsMisc

#endif



/* This forces readahead on a given range of bytes in an inode */

static inline void btrfs_force_ra(struct address_space *mapping,

				  struct file_ra_state *ra, struct file *file,

				  pgoff_t offset, unsigned long req_size)

{

	page_cache_sync_readahead(mapping, ra, file, offset, req_size);

}



struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry);

int btrfs_set_inode_index(struct inode *dir, u64 *index);

int btrfs_unlink_inode(struct btrfs_trans_handle *trans,
@@ -2551,9 +2559,6 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, 
int btrfs_merge_bio_hook(struct page *page, unsigned long offset,

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



unsigned long btrfs_force_ra(struct address_space *mapping,

			      struct file_ra_state *ra, struct file *file,

			      pgoff_t offset, pgoff_t last_index);

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);
@@ -2648,12 +2653,21 @@ do { \ 
/* acl.c */

#ifdef CONFIG_BTRFS_FS_POSIX_ACL

struct posix_acl *btrfs_get_acl(struct inode *inode, int type);

#else

#define btrfs_get_acl NULL

#endif

int btrfs_init_acl(struct btrfs_trans_handle *trans,

		   struct inode *inode, struct inode *dir);

int btrfs_acl_chmod(struct inode *inode);

#else

#define btrfs_get_acl NULL

static inline int btrfs_init_acl(struct btrfs_trans_handle *trans,

				 struct inode *inode, struct inode *dir)

{

	return 0;

}

static inline int btrfs_acl_chmod(struct inode *inode)

{

	return 0;

}

#endif



/* relocation.c */

int btrfs_relocate_block_group(struct btrfs_root *root, u64 group_start);

fs/btrfs/dir-item.c

+2 −28
Original line number Diff line number Diff line
@@ -198,8 +198,6 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, 
	struct btrfs_key key;

	int ins_len = mod < 0 ? -1 : 0;

	int cow = mod != 0;

	struct btrfs_key found_key;

	struct extent_buffer *leaf;



	key.objectid = dir;

	btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
@@ -209,18 +207,7 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, 
	ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);

	if (ret < 0)

		return ERR_PTR(ret);

	if (ret > 0) {

		if (path->slots[0] == 0)

			return NULL;

		path->slots[0]--;

	}



	leaf = path->nodes[0];

	btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);



	if (found_key.objectid != dir ||

	    btrfs_key_type(&found_key) != BTRFS_DIR_ITEM_KEY ||

	    found_key.offset != key.offset)

	if (ret > 0)

		return NULL;



	return btrfs_match_dir_item_name(root, path, name, name_len);
@@ -315,8 +302,6 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans, 
	struct btrfs_key key;

	int ins_len = mod < 0 ? -1 : 0;

	int cow = mod != 0;

	struct btrfs_key found_key;

	struct extent_buffer *leaf;



	key.objectid = dir;

	btrfs_set_key_type(&key, BTRFS_XATTR_ITEM_KEY);
@@ -324,18 +309,7 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans, 
	ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);

	if (ret < 0)

		return ERR_PTR(ret);

	if (ret > 0) {

		if (path->slots[0] == 0)

			return NULL;

		path->slots[0]--;

	}



	leaf = path->nodes[0];

	btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);



	if (found_key.objectid != dir ||

	    btrfs_key_type(&found_key) != BTRFS_XATTR_ITEM_KEY ||

	    found_key.offset != key.offset)

	if (ret > 0)

		return NULL;



	return btrfs_match_dir_item_name(root, path, name, name_len);