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

Commit 806468f8 authored by Chris Mason's avatar Chris Mason
Browse files

Merge git://git.jan-o-sch.net/btrfs-unstable into integration 



Conflicts:
	fs/btrfs/Makefile
	fs/btrfs/extent_io.c
	fs/btrfs/extent_io.h
	fs/btrfs/scrub.c

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parents 531f4b1a 5da6fcbc

fs/btrfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ 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

	   reada.o backref.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

fs/btrfs/backref.c

0 → 100644
+776 −0

File added.

Preview size limit exceeded, changes collapsed.

fs/btrfs/backref.h

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 STRATO.  All rights reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public

 * License v2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public

 * License along with this program; if not, write to the

 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,

 * Boston, MA 021110-1307, USA.

 */



#ifndef __BTRFS_BACKREF__

#define __BTRFS_BACKREF__



#include "ioctl.h"



struct inode_fs_paths {

	struct btrfs_path		*btrfs_path;

	struct btrfs_root		*fs_root;

	struct btrfs_data_container	*fspath;

};



typedef int (iterate_extent_inodes_t)(u64 inum, u64 offset, u64 root,

		void *ctx);

typedef int (iterate_irefs_t)(u64 parent, struct btrfs_inode_ref *iref,

				struct extent_buffer *eb, void *ctx);



int inode_item_info(u64 inum, u64 ioff, struct btrfs_root *fs_root,

			struct btrfs_path *path);



int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical,

			struct btrfs_path *path, struct btrfs_key *found_key);



int tree_backref_for_extent(unsigned long *ptr, struct extent_buffer *eb,

				struct btrfs_extent_item *ei, u32 item_size,

				u64 *out_root, u8 *out_level);



int iterate_extent_inodes(struct btrfs_fs_info *fs_info,

				struct btrfs_path *path,

				u64 extent_item_objectid,

				u64 extent_offset,

				iterate_extent_inodes_t *iterate, void *ctx);



int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info,

				struct btrfs_path *path,

				iterate_extent_inodes_t *iterate, void *ctx);



int paths_from_inode(u64 inum, struct inode_fs_paths *ipath);



struct btrfs_data_container *init_data_container(u32 total_bytes);

struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,

					struct btrfs_path *path);

void free_ipath(struct inode_fs_paths *ipath);



#endif

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static int btree_readpage_end_io_hook(struct page *page, u64 start, u64 end, 


static int btree_io_failed_hook(struct bio *failed_bio,

			 struct page *page, u64 start, u64 end,

			 struct extent_state *state)

			 u64 mirror_num, struct extent_state *state)

{

	struct extent_io_tree *tree;

	unsigned long len;
@@ -944,7 +944,7 @@ static int btree_readpage(struct file *file, struct page *page) 
{

	struct extent_io_tree *tree;

	tree = &BTRFS_I(page->mapping->host)->io_tree;

	return extent_read_full_page(tree, page, btree_get_extent);

	return extent_read_full_page(tree, page, btree_get_extent, 0);

}



static int btree_releasepage(struct page *page, gfp_t gfp_flags)

fs/btrfs/extent-tree.c

+5 −5
Original line number Diff line number Diff line
@@ -1788,18 +1788,18 @@ static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr, 
{

	int ret;

	u64 discarded_bytes = 0;

	struct btrfs_multi_bio *multi = NULL;

	struct btrfs_bio *bbio = NULL;





	/* Tell the block device(s) that the sectors can be discarded */

	ret = btrfs_map_block(&root->fs_info->mapping_tree, REQ_DISCARD,

			      bytenr, &num_bytes, &multi, 0);

			      bytenr, &num_bytes, &bbio, 0);

	if (!ret) {

		struct btrfs_bio_stripe *stripe = multi->stripes;

		struct btrfs_bio_stripe *stripe = bbio->stripes;

		int i;





		for (i = 0; i < multi->num_stripes; i++, stripe++) {

		for (i = 0; i < bbio->num_stripes; i++, stripe++) {

			if (!stripe->dev->can_discard)

				continue;
@@ -1818,7 +1818,7 @@ static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr, 
			 */

			ret = 0;

		}

		kfree(multi);

		kfree(bbio);

	}



	if (actual_bytes)