diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-23 14:37:47 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-23 14:37:47 -0400 |
| commit | d6c0cb379c5198487e4ac124728cbb2346d63b1f (patch) | |
| tree | 167a97ac58c7a2fbf7c4e94b6abbfe1e03af014a /fs/btrfs/ctree.h | |
| parent | 8e531cdfeb75269c6c5aae33651cca39707848da (diff) | |
| parent | 1f78160ce1b1b8e657e2248118c4d91f881763f0 (diff) | |
| download | kernel_samsung_smdk4412-d6c0cb379c5198487e4ac124728cbb2346d63b1f.zip kernel_samsung_smdk4412-d6c0cb379c5198487e4ac124728cbb2346d63b1f.tar.gz kernel_samsung_smdk4412-d6c0cb379c5198487e4ac124728cbb2346d63b1f.tar.bz2 | |
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/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 0d50c57..026fc47 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1113,9 +1113,6 @@ struct btrfs_fs_info { struct btrfs_root { struct extent_buffer *node; - /* the node lock is held while changing the node pointer */ - spinlock_t node_lock; - struct extent_buffer *commit_root; struct btrfs_root *log_root; struct btrfs_root *reloc_root; |