diff options
| author | Chris Mason | 2011-07-27 22:13:10 +0200 |
|---|---|---|
| committer | Chris Mason | 2011-07-27 22:18:13 +0200 |
| commit | ff95acb6733d41a8d45feb0e18b96df25e610e78 (patch) | |
| tree | e20983c579c9095970aefa9cb176a9df0654d1e4 /fs/btrfs/volumes.c | |
| parent | Linux 3.0 (diff) | |
| parent | Btrfs: make sure reserve_metadata_bytes doesn't leak out strange errors (diff) | |
| download | kernel-qcow2-linux-ff95acb6733d41a8d45feb0e18b96df25e610e78.tar.gz kernel-qcow2-linux-ff95acb6733d41a8d45feb0e18b96df25e610e78.tar.xz kernel-qcow2-linux-ff95acb6733d41a8d45feb0e18b96df25e610e78.zip | |
Merge branch 'integration' into for-linus
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 19450bc53632..b89e372c7544 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -3595,7 +3595,7 @@ int btrfs_read_sys_array(struct btrfs_root *root) if (!sb) return -ENOMEM; btrfs_set_buffer_uptodate(sb); - btrfs_set_buffer_lockdep_class(sb, 0); + btrfs_set_buffer_lockdep_class(root->root_key.objectid, sb, 0); write_extent_buffer(sb, super_copy, 0, BTRFS_SUPER_INFO_SIZE); array_size = btrfs_super_sys_array_size(super_copy); |