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

Commit b82207b8 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 fixes from Chris Mason:
 "We've queued up a few fixes in my for-linus branch"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix crash when starting transaction
  Btrfs: fix btrfs_print_leaf for skinny metadata
  Btrfs: fix race of using total_bytes_pinned
  btrfs: use E2BIG instead of EIO if compression does not help
  btrfs: remove stale comment from btrfs_flush_all_pending_stuffs
  Btrfs: fix use-after-free when cloning a trailing file hole
  btrfs: fix null pointer dereference in btrfs_show_devname when name is null
  btrfs: fix null pointer dereference in clone_fs_devices when name is null
  btrfs: fix nossd and ssd_spread mount option regression
  Btrfs: fix race between balance recovery and root deletion
  Btrfs: atomically set inode->i_flags in btrfs_update_iflags
  btrfs: only unlock block in verify_parent_transid if we locked it
  Btrfs: assert send doesn't attempt to start transactions
  btrfs compression: reuse recently used workspace
  Btrfs: fix crash when mounting raid5 btrfs with missing disks
  btrfs: create sprout should rename fsid on the sysfs as well
  btrfs: dev replace should replace the sysfs entry
  btrfs: dev add should add its sysfs entry
  btrfs: dev delete should remove sysfs entry
  btrfs: rename add_device_membership to btrfs_kobj_add_device
parents 034a0f6b abdd2e80

fs/btrfs/compression.c

+1 −1
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ static void free_workspace(int type, struct list_head *workspace) 


	spin_lock(workspace_lock);

	if (*num_workspace < num_online_cpus()) {

		list_add_tail(workspace, idle_workspace);

		list_add(workspace, idle_workspace);

		(*num_workspace)++;

		spin_unlock(workspace_lock);

		goto wake;

fs/btrfs/dev-replace.c

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "check-integrity.h"

#include "rcu-string.h"

#include "dev-replace.h"

#include "sysfs.h"



static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,

				       int scrub_ret);
@@ -562,6 +563,10 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
		fs_info->fs_devices->latest_bdev = tgt_device->bdev;

	list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list);



	/* replace the sysfs entry */

	btrfs_kobj_rm_device(fs_info, src_device);

	btrfs_kobj_add_device(fs_info, tgt_device);



	btrfs_rm_dev_replace_blocked(fs_info);



	btrfs_rm_dev_replace_srcdev(fs_info, src_device);

fs/btrfs/disk-io.c

+4 −1
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree, 
out:

	unlock_extent_cached(io_tree, eb->start, eb->start + eb->len - 1,

			     &cached_state, GFP_NOFS);

	if (need_lock)

		btrfs_tree_read_unlock_blocking(eb);

	return ret;

}
@@ -2904,7 +2905,9 @@ int open_ctree(struct super_block *sb, 
		if (ret)

			goto fail_qgroup;



		mutex_lock(&fs_info->cleaner_mutex);

		ret = btrfs_recover_relocation(tree_root);

		mutex_unlock(&fs_info->cleaner_mutex);

		if (ret < 0) {

			printk(KERN_WARNING

			       "BTRFS: failed to recover relocation\n");

fs/btrfs/extent-tree.c

+1 −4
Original line number Diff line number Diff line
@@ -5678,7 +5678,6 @@ void btrfs_prepare_extent_commit(struct btrfs_trans_handle *trans, 
	struct btrfs_caching_control *next;

	struct btrfs_caching_control *caching_ctl;

	struct btrfs_block_group_cache *cache;

	struct btrfs_space_info *space_info;



	down_write(&fs_info->commit_root_sem);
@@ -5701,9 +5700,6 @@ void btrfs_prepare_extent_commit(struct btrfs_trans_handle *trans, 


	up_write(&fs_info->commit_root_sem);



	list_for_each_entry_rcu(space_info, &fs_info->space_info, list)

		percpu_counter_set(&space_info->total_bytes_pinned, 0);



	update_global_block_rsv(fs_info);

}
@@ -5741,6 +5737,7 @@ static int unpin_extent_range(struct btrfs_root *root, u64 start, u64 end) 
		spin_lock(&cache->lock);

		cache->pinned -= len;

		space_info->bytes_pinned -= len;

		percpu_counter_add(&space_info->total_bytes_pinned, -len);

		if (cache->ro) {

			space_info->bytes_readonly += len;

			readonly = true;

fs/btrfs/ioctl.c

+19 −18
Original line number Diff line number Diff line
@@ -136,19 +136,22 @@ static unsigned int btrfs_flags_to_ioctl(unsigned int flags) 
void btrfs_update_iflags(struct inode *inode)

{

	struct btrfs_inode *ip = BTRFS_I(inode);



	inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC);

	unsigned int new_fl = 0;



	if (ip->flags & BTRFS_INODE_SYNC)

		inode->i_flags |= S_SYNC;

		new_fl |= S_SYNC;

	if (ip->flags & BTRFS_INODE_IMMUTABLE)

		inode->i_flags |= S_IMMUTABLE;

		new_fl |= S_IMMUTABLE;

	if (ip->flags & BTRFS_INODE_APPEND)

		inode->i_flags |= S_APPEND;

		new_fl |= S_APPEND;

	if (ip->flags & BTRFS_INODE_NOATIME)

		inode->i_flags |= S_NOATIME;

		new_fl |= S_NOATIME;

	if (ip->flags & BTRFS_INODE_DIRSYNC)

		inode->i_flags |= S_DIRSYNC;

		new_fl |= S_DIRSYNC;



	set_mask_bits(&inode->i_flags,

		      S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME | S_DIRSYNC,

		      new_fl);

}



/*
@@ -3139,7 +3142,6 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans, 
static void clone_update_extent_map(struct inode *inode,

				    const struct btrfs_trans_handle *trans,

				    const struct btrfs_path *path,

				    struct btrfs_file_extent_item *fi,

				    const u64 hole_offset,

				    const u64 hole_len)

{
@@ -3154,7 +3156,11 @@ static void clone_update_extent_map(struct inode *inode, 
		return;

	}



	if (fi) {

	if (path) {

		struct btrfs_file_extent_item *fi;



		fi = btrfs_item_ptr(path->nodes[0], path->slots[0],

				    struct btrfs_file_extent_item);

		btrfs_extent_item_to_extent_map(inode, path, fi, false, em);

		em->generation = -1;

		if (btrfs_file_extent_type(path->nodes[0], fi) ==
@@ -3508,18 +3514,15 @@ static int btrfs_clone(struct inode *src, struct inode *inode, 
					    btrfs_item_ptr_offset(leaf, slot),

					    size);

				inode_add_bytes(inode, datal);

				extent = btrfs_item_ptr(leaf, slot,

						struct btrfs_file_extent_item);

			}



			/* If we have an implicit hole (NO_HOLES feature). */

			if (drop_start < new_key.offset)

				clone_update_extent_map(inode, trans,

						path, NULL, drop_start,

						NULL, drop_start,

						new_key.offset - drop_start);



			clone_update_extent_map(inode, trans, path,

						extent, 0, 0);

			clone_update_extent_map(inode, trans, path, 0, 0);



			btrfs_mark_buffer_dirty(leaf);

			btrfs_release_path(path);
@@ -3562,12 +3565,10 @@ static int btrfs_clone(struct inode *src, struct inode *inode, 
			btrfs_end_transaction(trans, root);

			goto out;

		}

		clone_update_extent_map(inode, trans, NULL, last_dest_end,

					destoff + len - last_dest_end);

		ret = clone_finish_inode_update(trans, inode, destoff + len,

						destoff, olen);

		if (ret)

			goto out;

		clone_update_extent_map(inode, trans, path, NULL, last_dest_end,

					destoff + len - last_dest_end);

	}



out: