Commit b25b550b 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/btrfs-unstable 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: The file argument for fsync() is never null
  Btrfs: handle ERR_PTR from posix_acl_from_xattr()
  Btrfs: avoid BUG when dropping root and reference in same transaction
  Btrfs: prohibit a operation of changing acl's mask when noacl mount option used
  Btrfs: should add a permission check for setfacl
  Btrfs: btrfs_lookup_dir_item() can return ERR_PTR
  Btrfs: btrfs_read_fs_root_no_name() returns ERR_PTRs
  Btrfs: unwind after btrfs_start_transaction() errors
  Btrfs: btrfs_iget() returns ERR_PTR
  Btrfs: handle kzalloc() failure in open_ctree()
  Btrfs: handle error returns from btrfs_lookup_dir_item()
  Btrfs: Fix BUG_ON for fs converted from extN
  Btrfs: Fix null dereference in relocation.c
  Btrfs: fix remap_file_pages error
  Btrfs: uninitialized data is check_path_shared()
  Btrfs: fix fallocate regression
  Btrfs: fix loop device on top of btrfs
parents eda05477 6f902af4

fs/btrfs/acl.c

+8 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ static struct posix_acl *btrfs_get_acl(struct inode *inode, int type) 
		size = __btrfs_getxattr(inode, name, value, size);

		if (size > 0) {

			acl = posix_acl_from_xattr(value, size);

			if (IS_ERR(acl))

				return acl;

			set_cached_acl(inode, type, acl);

		}

		kfree(value);
@@ -160,6 +162,12 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name, 
	int ret;

	struct posix_acl *acl = NULL;



	if (!is_owner_or_cap(dentry->d_inode))

		return -EPERM;



	if (!IS_POSIXACL(dentry->d_inode))

		return -EOPNOTSUPP;



	if (value) {

		acl = posix_acl_from_xattr(value, size);

		if (acl == NULL) {

fs/btrfs/disk-io.c

+9 −2
Original line number Diff line number Diff line
@@ -1941,8 +1941,11 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
		     btrfs_level_size(tree_root,

				      btrfs_super_log_root_level(disk_super));



		log_tree_root = kzalloc(sizeof(struct btrfs_root),

						      GFP_NOFS);

		log_tree_root = kzalloc(sizeof(struct btrfs_root), GFP_NOFS);

		if (!log_tree_root) {

			err = -ENOMEM;

			goto fail_trans_kthread;

		}



		__setup_root(nodesize, leafsize, sectorsize, stripesize,

			     log_tree_root, fs_info, BTRFS_TREE_LOG_OBJECTID);
@@ -1982,6 +1985,10 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	fs_info->fs_root = btrfs_read_fs_root_no_name(fs_info, &location);

	if (!fs_info->fs_root)

		goto fail_trans_kthread;

	if (IS_ERR(fs_info->fs_root)) {

		err = PTR_ERR(fs_info->fs_root);

		goto fail_trans_kthread;

	}



	if (!(sb->s_flags & MS_RDONLY)) {

		down_read(&fs_info->cleanup_work_sem);

fs/btrfs/extent-tree.c

+2 −1
Original line number Diff line number Diff line
@@ -4360,7 +4360,8 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, 


	block_rsv = get_block_rsv(trans, root);

	cache = btrfs_lookup_block_group(root->fs_info, buf->start);

	BUG_ON(block_rsv->space_info != cache->space_info);

	if (block_rsv->space_info != cache->space_info)

		goto out;



	if (btrfs_header_generation(buf) == trans->transid) {

		if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) {

fs/btrfs/file.c

+10 −2
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ int btrfs_sync_file(struct file *file, int datasync) 
	/*

	 * ok we haven't committed the transaction yet, lets do a commit

	 */

	if (file && file->private_data)

	if (file->private_data)

		btrfs_ioctl_trans_end(file);



	trans = btrfs_start_transaction(root, 0);
@@ -1190,14 +1190,22 @@ static const struct vm_operations_struct btrfs_file_vm_ops = { 


static int btrfs_file_mmap(struct file	*filp, struct vm_area_struct *vma)

{

	vma->vm_ops = &btrfs_file_vm_ops;

	struct address_space *mapping = filp->f_mapping;



	if (!mapping->a_ops->readpage)

		return -ENOEXEC;



	file_accessed(filp);

	vma->vm_ops = &btrfs_file_vm_ops;

	vma->vm_flags |= VM_CAN_NONLINEAR;



	return 0;

}



const struct file_operations btrfs_file_operations = {

	.llseek		= generic_file_llseek,

	.read		= do_sync_read,

	.write		= do_sync_write,

	.aio_read       = generic_file_aio_read,

	.splice_read	= generic_file_splice_read,

	.aio_write	= btrfs_file_aio_write,

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -2673,7 +2673,7 @@ static int check_path_shared(struct btrfs_root *root, 
	struct extent_buffer *eb;

	int level;

	int ret;

	u64 refs;

	u64 refs = 1;



	for (level = 0; level < BTRFS_MAX_LEVEL; level++) {

		if (!path->nodes[level])
@@ -6884,7 +6884,7 @@ static long btrfs_fallocate(struct inode *inode, int mode, 
		if (em->block_start == EXTENT_MAP_HOLE ||

		    (cur_offset >= inode->i_size &&

		     !test_bit(EXTENT_FLAG_PREALLOC, &em->flags))) {

			ret = btrfs_prealloc_file_range(inode, 0, cur_offset,

			ret = btrfs_prealloc_file_range(inode, mode, cur_offset,

							last_byte - cur_offset,

							1 << inode->i_blkbits,

							offset + len,

CRA Git | Maintained and supported by SUSTech CRA and CCSE