Commit b695188d 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 

Pull btrfs update from Chris Mason:
 "The biggest feature in the pull is the new (and still experimental)
  raid56 code that David Woodhouse started long ago.  I'm still working
  on the parity logging setup that will avoid inconsistent parity after
  a crash, so this is only for testing right now.  But, I'd really like
  to get it out to a broader audience to hammer out any performance
  issues or other problems.

  scrub does not yet correct errors on raid5/6 either.

  Josef has another pass at fsync performance.  The big change here is
  to combine waiting for metadata with waiting for data, which is a big
  latency win.  It is also step one toward using atomics from the
  hardware during a commit.

  Mark Fasheh has a new way to use btrfs send/receive to send only the
  metadata changes.  SUSE is using this to make snapper more efficient
  at finding changes between snapshosts.

  Snapshot-aware defrag is also included.

  Otherwise we have a large number of fixes and cleanups.  Eric Sandeen
  wins the award for removing the most lines, and I'm hoping we steal
  this idea from XFS over and over again."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (118 commits)
  btrfs: fixup/remove module.h usage as required
  Btrfs: delete inline extents when we find them during logging
  btrfs: try harder to allocate raid56 stripe cache
  Btrfs: cleanup to make the function btrfs_delalloc_reserve_metadata more logic
  Btrfs: don't call btrfs_qgroup_free if just btrfs_qgroup_reserve fails
  Btrfs: remove reduplicate check about root in the function btrfs_clean_quota_tree
  Btrfs: return ENOMEM rather than use BUG_ON when btrfs_alloc_path fails
  Btrfs: fix missing deleted items in btrfs_clean_quota_tree
  btrfs: use only inline_pages from extent buffer
  Btrfs: fix wrong reserved space when deleting a snapshot/subvolume
  Btrfs: fix wrong reserved space in qgroup during snap/subv creation
  Btrfs: remove unnecessary dget_parent/dput when creating the pending snapshot
  btrfs: remove a printk from scan_one_device
  Btrfs: fix NULL pointer after aborting a transaction
  Btrfs: fix memory leak of log roots
  Btrfs: copy everything if we've created an inline extent
  btrfs: cleanup for open-coded alignment
  Btrfs: do not change inode flags in rename
  Btrfs: use reserved space for creating a snapshot
  clear chunk_alloc flag on retryable failure
  ...
parents 48476df9 180e001c

fs/btrfs/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ config BTRFS_FS 
	select ZLIB_DEFLATE

	select LZO_COMPRESS

	select LZO_DECOMPRESS

	select RAID6_PQ

	select XOR_BLOCKS



	help

	  Btrfs is a new filesystem with extents, writable snapshotting,

	  support for multiple devices and many more features.

fs/btrfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 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 backref.o ulist.o qgroup.o send.o dev-replace.o

	   reada.o backref.o ulist.o qgroup.o send.o dev-replace.o raid56.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o

fs/btrfs/backref.c

+1 −4
Original line number Diff line number Diff line
@@ -352,11 +352,8 @@ static int __resolve_indirect_refs(struct btrfs_fs_info *fs_info, 
		err = __resolve_indirect_ref(fs_info, search_commit_root,

					     time_seq, ref, parents,

					     extent_item_pos);

		if (err) {

			if (ret == 0)

				ret = err;

		if (err)

			continue;

		}



		/* we put the first parent into the ref at hand */

		ULIST_ITER_INIT(&uiter);

fs/btrfs/backref.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#ifndef __BTRFS_BACKREF__

#define __BTRFS_BACKREF__



#include "ioctl.h"

#include <linux/btrfs.h>

#include "ulist.h"

#include "extent_io.h"

fs/btrfs/btrfs_inode.h

+20 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
#define BTRFS_INODE_HAS_ASYNC_EXTENT		6

#define BTRFS_INODE_NEEDS_FULL_SYNC		7

#define BTRFS_INODE_COPY_EVERYTHING		8

#define BTRFS_INODE_IN_DELALLOC_LIST		9

#define BTRFS_INODE_READDIO_NEED_LOCK		10



/* in memory btrfs inode */

struct btrfs_inode {
@@ -216,4 +218,22 @@ static inline int btrfs_inode_in_log(struct inode *inode, u64 generation) 
	return 0;

}



/*

 * Disable DIO read nolock optimization, so new dio readers will be forced

 * to grab i_mutex. It is used to avoid the endless truncate due to

 * nonlocked dio read.

 */

static inline void btrfs_inode_block_unlocked_dio(struct inode *inode)

{

	set_bit(BTRFS_INODE_READDIO_NEED_LOCK, &BTRFS_I(inode)->runtime_flags);

	smp_mb();

}



static inline void btrfs_inode_resume_unlocked_dio(struct inode *inode)

{

	smp_mb__before_clear_bit();

	clear_bit(BTRFS_INODE_READDIO_NEED_LOCK,

		  &BTRFS_I(inode)->runtime_flags);

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE