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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: always pin metadata in discard mode
  Btrfs: enable discard support
  Btrfs: add -o discard option
  Btrfs: properly wait log writers during log sync
  Btrfs: fix possible ENOSPC problems with truncate
  Btrfs: fix btrfs acl #ifdef checks
  Btrfs: streamline tree-log btree block writeout
  Btrfs: avoid tree log commit when there are no changes
  Btrfs: only write one super copy during fsync
parents 2b650df2 444528b3

fs/btrfs/acl.c

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "btrfs_inode.h"

#include "xattr.h"



#ifdef CONFIG_BTRFS_POSIX_ACL

#ifdef CONFIG_BTRFS_FS_POSIX_ACL



static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)

{
@@ -313,7 +313,7 @@ struct xattr_handler btrfs_xattr_acl_access_handler = { 
	.set	= btrfs_xattr_acl_access_set,

};



#else /* CONFIG_BTRFS_POSIX_ACL */

#else /* CONFIG_BTRFS_FS_POSIX_ACL */



int btrfs_acl_chmod(struct inode *inode)

{
@@ -325,4 +325,4 @@ int btrfs_init_acl(struct inode *inode, struct inode *dir) 
	return 0;

}



#endif /* CONFIG_BTRFS_POSIX_ACL */
 
#endif /* CONFIG_BTRFS_FS_POSIX_ACL */

fs/btrfs/btrfs_inode.h

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,12 @@ struct btrfs_inode { 
	 * transid of the trans_handle that last modified this inode

	 */

	u64 last_trans;



	/*

	 * log transid when this inode was last modified

	 */

	u64 last_sub_trans;



	/*

	 * transid that last logged this inode

	 */

fs/btrfs/ctree.h

+3 −1
Original line number Diff line number Diff line
@@ -1009,6 +1009,7 @@ struct btrfs_root { 
	atomic_t log_writers;

	atomic_t log_commit[2];

	unsigned long log_transid;

	unsigned long last_log_commit;

	unsigned long log_batch;

	pid_t log_start_pid;

	bool log_multiple_pids;
@@ -1152,6 +1153,7 @@ struct btrfs_root { 
#define BTRFS_MOUNT_FLUSHONCOMMIT       (1 << 7)

#define BTRFS_MOUNT_SSD_SPREAD		(1 << 8)

#define BTRFS_MOUNT_NOSSD		(1 << 9)

#define BTRFS_MOUNT_DISCARD		(1 << 10)



#define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)

#define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)
@@ -2373,7 +2375,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options); 
int btrfs_sync_fs(struct super_block *sb, int wait);



/* acl.c */

#ifdef CONFIG_BTRFS_POSIX_ACL

#ifdef CONFIG_BTRFS_FS_POSIX_ACL

int btrfs_check_acl(struct inode *inode, int mask);

#else

#define btrfs_check_acl NULL

fs/btrfs/disk-io.c

+2 −0
Original line number Diff line number Diff line
@@ -917,6 +917,7 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, 
	atomic_set(&root->log_writers, 0);

	root->log_batch = 0;

	root->log_transid = 0;

	root->last_log_commit = 0;

	extent_io_tree_init(&root->dirty_log_pages,

			     fs_info->btree_inode->i_mapping, GFP_NOFS);
@@ -1087,6 +1088,7 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans, 
	WARN_ON(root->log_root);

	root->log_root = log_root;

	root->log_transid = 0;

	root->last_log_commit = 0;

	return 0;

}

fs/btrfs/extent-tree.c

+11 −6
Original line number Diff line number Diff line
@@ -1568,23 +1568,23 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans, 
	return ret;

}



#ifdef BIO_RW_DISCARD

static void btrfs_issue_discard(struct block_device *bdev,

				u64 start, u64 len)

{

	blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL,

			     DISCARD_FL_BARRIER);

}

#endif



static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,

				u64 num_bytes)

{

#ifdef BIO_RW_DISCARD

	int ret;

	u64 map_length = num_bytes;

	struct btrfs_multi_bio *multi = NULL;



	if (!btrfs_test_opt(root, DISCARD))

		return 0;



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

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

			      bytenr, &map_length, &multi, 0);
@@ -1604,9 +1604,6 @@ static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr, 
	}



	return ret;

#else

	return 0;

#endif

}



int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
@@ -3690,6 +3687,14 @@ static int pin_down_bytes(struct btrfs_trans_handle *trans, 
	if (is_data)

		goto pinit;



	/*

	 * discard is sloooow, and so triggering discards on

	 * individual btree blocks isn't a good plan.  Just

	 * pin everything in discard mode.

	 */

	if (btrfs_test_opt(root, DISCARD))

		goto pinit;



	buf = btrfs_find_tree_block(root, bytenr, num_bytes);

	if (!buf)

		goto pinit;