diff options
author | Chris Mason <chris.mason@oracle.com> | 2011-05-23 18:37:47 (GMT) |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2011-05-23 18:37:47 (GMT) |
commit | d6c0cb379c5198487e4ac124728cbb2346d63b1f (patch) | |
tree | 167a97ac58c7a2fbf7c4e94b6abbfe1e03af014a /fs/btrfs/volumes.h | |
parent | 8e531cdfeb75269c6c5aae33651cca39707848da (diff) | |
parent | 1f78160ce1b1b8e657e2248118c4d91f881763f0 (diff) | |
download | linux-fsl-qoriq-d6c0cb379c5198487e4ac124728cbb2346d63b1f.tar.xz |
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>
Diffstat (limited to 'fs/btrfs/volumes.h')
-rw-r--r-- | fs/btrfs/volumes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 7c58a7b..7c12d61 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 { |