Merge branch 'for-chris' of... (cfc442b6) · Commits · e / devices / android_kernel_samsung_universal8890

fs/btrfs/acl.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -227,7 +227,11 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,
		if (ret > 0) {
		/* we need an acl */
		ret = btrfs_set_acl(trans, inode, acl, ACL_TYPE_ACCESS);
		} else {
		cache_no_acl(inode);
		}
		} else {
		cache_no_acl(inode);
		}
		failed:
		posix_acl_release(acl);

fs/btrfs/btrfs_inode.h

+30 −20

Original line number	Diff line number	Diff line
		@@ -24,6 +24,20 @@
		#include "ordered-data.h"
		#include "delayed-inode.h"

		/*
		* ordered_data_close is set by truncate when a file that used
		* to have good data has been truncated to zero. When it is set
		* the btrfs file release call will add this inode to the
		* ordered operations list so that we make sure to flush out any
		* new data the application may have written before commit.
		*/
		#define BTRFS_INODE_ORDERED_DATA_CLOSE 0
		#define BTRFS_INODE_ORPHAN_META_RESERVED 1
		#define BTRFS_INODE_DUMMY 2
		#define BTRFS_INODE_IN_DEFRAG 3
		#define BTRFS_INODE_DELALLOC_META_RESERVED 4
		#define BTRFS_INODE_HAS_ORPHAN_ITEM 5

		/* in memory btrfs inode */
		struct btrfs_inode {
		/* which subvolume this inode belongs to */
		@@ -57,9 +71,6 @@ struct btrfs_inode {
		/* used to order data wrt metadata */
		struct btrfs_ordered_inode_tree ordered_tree;

		/* for keeping track of orphaned inodes */
		struct list_head i_orphan;

		/* list of all the delalloc inodes in the FS. There are times we need
		* to write all the delalloc pages to disk, and this list is used
		* to walk them all.
		@@ -78,14 +89,13 @@ struct btrfs_inode {
		/* the space_info for where this inode's data allocations are done */
		struct btrfs_space_info *space_info;

		unsigned long runtime_flags;

		/* full 64 bit generation number, struct vfs_inode doesn't have a big
		* enough field for this.
		*/
		u64 generation;

		/* sequence number for NFS changes */
		u64 sequence;

		/*
		* transid of the trans_handle that last modified this inode
		*/
		@@ -144,23 +154,10 @@ struct btrfs_inode {
		unsigned outstanding_extents;
		unsigned reserved_extents;

		/*
		* ordered_data_close is set by truncate when a file that used
		* to have good data has been truncated to zero. When it is set
		* the btrfs file release call will add this inode to the
		* ordered operations list so that we make sure to flush out any
		* new data the application may have written before commit.
		*/
		unsigned ordered_data_close:1;
		unsigned orphan_meta_reserved:1;
		unsigned dummy_inode:1;
		unsigned in_defrag:1;
		unsigned delalloc_meta_reserved:1;

		/*
		* always compress this one file
		*/
		unsigned force_compress:4;
		unsigned force_compress;

		struct btrfs_delayed_node *delayed_node;

		@@ -202,4 +199,17 @@ static inline bool btrfs_is_free_space_inode(struct btrfs_root *root,
		return false;
		}

		static inline int btrfs_inode_in_log(struct inode *inode, u64 generation)
		{
		struct btrfs_root *root = BTRFS_I(inode)->root;
		int ret = 0;

		mutex_lock(&root->log_mutex);
		if (BTRFS_I(inode)->logged_trans == generation &&
		BTRFS_I(inode)->last_sub_trans <= root->last_log_commit)
		ret = 1;
		mutex_unlock(&root->log_mutex);
		return ret;
		}

		#endif

fs/btrfs/check-integrity.c

+436 −148

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/ctree.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -739,7 +739,11 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
		if (!cur)
		return -EIO;
		} else if (!uptodate) {
		btrfs_read_buffer(cur, gen);
		err = btrfs_read_buffer(cur, gen);
		if (err) {
		free_extent_buffer(cur);
		return err;
		}
		}
		}
		if (search_start == 0)
		@@ -854,21 +858,19 @@ static noinline int generic_bin_search(struct extent_buffer *eb,
		static int bin_search(struct extent_buffer eb, struct btrfs_key key,
		int level, int *slot)
		{
		if (level == 0) {
		if (level == 0)
		return generic_bin_search(eb,
		offsetof(struct btrfs_leaf, items),
		sizeof(struct btrfs_item),
		key, btrfs_header_nritems(eb),
		slot);
		} else {
		else
		return generic_bin_search(eb,
		offsetof(struct btrfs_node, ptrs),
		sizeof(struct btrfs_key_ptr),
		key, btrfs_header_nritems(eb),
		slot);
		}
		return -1;
		}

		int btrfs_bin_search(struct extent_buffer eb, struct btrfs_key key,
		int level, int *slot)

fs/btrfs/ctree.h

+42 −1

Original line number	Diff line number	Diff line
		@@ -173,6 +173,9 @@ static int btrfs_csum_sizes[] = { 4, 0 };
		#define BTRFS_FT_XATTR 8
		#define BTRFS_FT_MAX 9

		/* ioprio of readahead is set to idle */
		#define BTRFS_IOPRIO_READA (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0))

		/*
		* The key defines the order in the tree, and so it also defines (optimal)
		* block layout.
		@@ -823,6 +826,14 @@ struct btrfs_csum_item {
		u8 csum;
		} __attribute__ ((__packed__));

		struct btrfs_dev_stats_item {
		/*
		* grow this item struct at the end for future enhancements and keep
		* the existing values unchanged
		*/
		__le64 values[BTRFS_DEV_STAT_VALUES_MAX];
		} __attribute__ ((__packed__));

		/* different types of block groups (and chunks) */
		#define BTRFS_BLOCK_GROUP_DATA (1ULL << 0)
		#define BTRFS_BLOCK_GROUP_SYSTEM (1ULL << 1)
		@@ -1375,7 +1386,7 @@ struct btrfs_root {
		struct list_head root_list;

		spinlock_t orphan_lock;
		struct list_head orphan_list;
		atomic_t orphan_inodes;
		struct btrfs_block_rsv *orphan_block_rsv;
		int orphan_item_inserted;
		int orphan_cleanup_state;
		@@ -1507,6 +1518,12 @@ struct btrfs_ioctl_defrag_range_args {

		#define BTRFS_BALANCE_ITEM_KEY 248

		/*
		* Persistantly stores the io stats in the device tree.
		* One key for all stats, (0, BTRFS_DEV_STATS_KEY, devid).
		*/
		#define BTRFS_DEV_STATS_KEY 249

		/*
		* string items are for debugging. They just store a short string of
		* data in the FS
		@@ -2415,6 +2432,30 @@ static inline u32 btrfs_file_extent_inline_item_len(struct extent_buffer *eb,
		return btrfs_item_size(eb, e) - offset;
		}

		/* btrfs_dev_stats_item */
		static inline u64 btrfs_dev_stats_value(struct extent_buffer *eb,
		struct btrfs_dev_stats_item *ptr,
		int index)
		{
		u64 val;

		read_extent_buffer(eb, &val,
		offsetof(struct btrfs_dev_stats_item, values) +
		((unsigned long)ptr) + (index * sizeof(u64)),
		sizeof(val));
		return val;
		}

		static inline void btrfs_set_dev_stats_value(struct extent_buffer *eb,
		struct btrfs_dev_stats_item *ptr,
		int index, u64 val)
		{
		write_extent_buffer(eb, &val,
		offsetof(struct btrfs_dev_stats_item, values) +
		((unsigned long)ptr) + (index * sizeof(u64)),
		sizeof(val));
		}

		static inline struct btrfs_fs_info btrfs_sb(struct super_block sb)
		{
		return sb->s_fs_info;