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

Commit 6a6662ce 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/linux-btrfs 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (114 commits)
  Btrfs: check for a null fs root when writing to the backup root log
  Btrfs: fix race during transaction joins
  Btrfs: fix a potential btrfs_bio leak on scrub fixups
  Btrfs: rename btrfs_bio multi -> bbio for consistency
  Btrfs: stop leaking btrfs_bios on readahead
  Btrfs: stop the readahead threads on failed mount
  Btrfs: fix extent_buffer leak in the metadata IO error handling
  Btrfs: fix the new inspection ioctls for 32 bit compat
  Btrfs: fix delayed insertion reservation
  Btrfs: ClearPageError during writepage and clean_tree_block
  Btrfs: be smarter about committing the transaction in reserve_metadata_bytes
  Btrfs: make a delayed_block_rsv for the delayed item insertion
  Btrfs: add a log of past tree roots
  btrfs: separate superblock items out of fs_info
  Btrfs: use the global reserve when truncating the free space cache inode
  Btrfs: release metadata from global reserve if we have to fallback for unlink
  Btrfs: make sure to flush queued bios if write_cache_pages waits
  Btrfs: fix extent pinning bugs in the tree log
  Btrfs: make sure btrfs_remove_free_space doesn't leak EAGAIN
  Btrfs: don't wait as long for more batches during SSD log commit
  ...
parents 32aaeffb 7c7e82a7

fs/btrfs/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 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 free-space-cache.o zlib.o lzo.o \

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

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

	   reada.o backref.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

fs/btrfs/acl.c

+7 −10
Original line number Diff line number Diff line
@@ -59,22 +59,19 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type) 
		if (!value)

			return ERR_PTR(-ENOMEM);

		size = __btrfs_getxattr(inode, name, value, size);

	}

	if (size > 0) {

		acl = posix_acl_from_xattr(value, size);

			if (IS_ERR(acl)) {

				kfree(value);

				return acl;

			}

			set_cached_acl(inode, type, acl);

		}

		kfree(value);

	} else if (size == -ENOENT || size == -ENODATA || size == 0) {

		/* FIXME, who returns -ENOENT?  I think nobody */

		acl = NULL;

		set_cached_acl(inode, type, acl);

	} else {

		acl = ERR_PTR(-EIO);

	}

	kfree(value);



	if (!IS_ERR(acl))

		set_cached_acl(inode, type, acl);



	return acl;

}

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/btrfs_inode.h

+9 −8
Original line number Diff line number Diff line
@@ -103,11 +103,6 @@ struct btrfs_inode { 
	 */

	u64 delalloc_bytes;



	/* total number of bytes that may be used for this inode for

	 * delalloc

	 */

	u64 reserved_bytes;



	/*

	 * the size of the file stored in the metadata on disk.  data=ordered

	 * means the in-memory i_size might be larger than the size on disk
@@ -115,9 +110,6 @@ struct btrfs_inode { 
	 */

	u64 disk_i_size;



	/* flags field from the on disk inode */

	u32 flags;



	/*

	 * if this is a directory then index_cnt is the counter for the index

	 * number for new files that are created
@@ -131,6 +123,15 @@ struct btrfs_inode { 
	 */

	u64 last_unlink_trans;



	/*

	 * Number of bytes outstanding that are going to need csums.  This is

	 * used in ENOSPC accounting.

	 */

	u64 csum_bytes;



	/* flags field from the on disk inode */

	u32 flags;



	/*

	 * Counters to keep track of the number of extent item's we may use due

	 * to delalloc and such.  outstanding_extents is the number of extent