diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-10-01 16:14:24 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-10-01 16:14:24 +0200 |
commit | bebcb8dab6bac53b6a61a896db03781d1992cadb (patch) | |
tree | 4793b0c2e913db8cf573ee52d568471603273af6 /fs/btrfs/disk-io.c | |
parent | 26c21dd9885a2d8a4f4d539917c4877ffd399286 (diff) | |
parent | f1e0bb0ad473a32d1b7e6d285ae9f7e47710bb5e (diff) |
Merge branch 'irq/for-arm' into irq/core
Bring in the change which we offered arm[64] folks to pull into their
trees.
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 0d98aee34fee..295795aebe0b 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3765,9 +3765,7 @@ void close_ctree(struct btrfs_root *root) * block groups queued for removal, the deletion will be * skipped when we quit the cleaner thread. */ - mutex_lock(&root->fs_info->cleaner_mutex); btrfs_delete_unused_bgs(root->fs_info); - mutex_unlock(&root->fs_info->cleaner_mutex); ret = btrfs_commit_super(root); if (ret) |