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

Commit c226fd65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable 

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: try to free metadata pages when we free btree blocks
  Btrfs: add extra flushing for renames and truncates
  Btrfs: make sure btrfs_update_delayed_ref doesn't increase ref_mod
  Btrfs: optimize fsyncs on old files
  Btrfs: tree logging unlink/rename fixes
  Btrfs: Make sure i_nlink doesn't hit zero too soon during log replay
  Btrfs: limit balancing work while flushing delayed refs
  Btrfs: readahead checksums during btrfs_finish_ordered_io
  Btrfs: leave btree locks spinning more often
  Btrfs: Only let very young transactions grow during commit
  Btrfs: Check for a blocking lock before taking the spin
  Btrfs: reduce stack in cow_file_range
  Btrfs: reduce stalls during transaction commit
  Btrfs: process the delayed reference queue in clusters
  Btrfs: try to cleanup delayed refs while freeing extents
  Btrfs: reduce stack usage in some crucial tree balancing functions
  Btrfs: do extent allocation and reference count updates in the background
  Btrfs: don't preallocate metadata blocks during btrfs_search_slot
parents c09bca78 d57e62b8

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_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 \

	   ref-cache.o export.o tree-log.o acl.o free-space-cache.o zlib.o \

	   compression.o

	   compression.o delayed-ref.o

else



# Normal Makefile

fs/btrfs/btrfs_inode.h

+25 −6
Original line number Diff line number Diff line
@@ -66,6 +66,12 @@ struct btrfs_inode { 
	 */

	struct list_head delalloc_inodes;



	/*

	 * list for tracking inodes that must be sent to disk before a

	 * rename or truncate commit

	 */

	struct list_head ordered_operations;



	/* the space_info for where this inode's data allocations are done */

	struct btrfs_space_info *space_info;
@@ -86,12 +92,6 @@ struct btrfs_inode { 
	 */

	u64 logged_trans;



	/*

	 * trans that last made a change that should be fully fsync'd.  This

	 * gets reset to zero each time the inode is logged

	 */

	u64 log_dirty_trans;



	/* total number of bytes pending delalloc, used by stat to calc the

	 * real block usage of the file

	 */
@@ -121,6 +121,25 @@ struct btrfs_inode { 
	/* the start of block group preferred for allocations. */

	u64 block_group;



	/* the fsync log has some corner cases that mean we have to check

	 * directories to see if any unlinks have been done before

	 * the directory was logged.  See tree-log.c for all the

	 * details

	 */

	u64 last_unlink_trans;



	/*

	 * 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.

	 *

	 * yes, its silly to have a single bitflag, but we might grow more

	 * of these.

	 */

	unsigned ordered_data_close:1;



	struct inode vfs_inode;

};