Merge branch 'cleanups_and_fixes' into inode_numbers

Conflicts:
	fs/btrfs/tree-log.c
	fs/btrfs/volumes.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 7c58a7b2d99f..7c12d61ae7ae 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -89,6 +89,8 @@ struct btrfs_device {
         struct scrub_dev *scrub_device;
 
         struct btrfs_work work;
+        struct rcu_head rcu;
+        struct work_struct rcu_work;
 };
 
 struct btrfs_fs_devices {