diff options
| author | Chris Mason <clm@fb.com> | 2016-01-27 08:48:23 -0500 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-27 08:48:23 -0500 |
| commit | d32a4e34348869a273a01139112a13fc6870f003 (patch) | |
| tree | 507adf3bf14d2cafb38502c27ea8cc82b28cf11a /fs/btrfs/disk-io.c | |
| parent | bf6092066f80840410e3401cd962b23d54a95713 (diff) | |
| parent | 3e4c5efbb3ac7c9c4fb5f33b659fa98afe568ab1 (diff) | |
Merge branch 'dev/fst-followup' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 404e894c33d9..50bed6c8b66f 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -182,6 +182,7 @@ static struct btrfs_lockdep_keyset { | |||
| 182 | { .id = BTRFS_TREE_RELOC_OBJECTID, .name_stem = "treloc" }, | 182 | { .id = BTRFS_TREE_RELOC_OBJECTID, .name_stem = "treloc" }, |
| 183 | { .id = BTRFS_DATA_RELOC_TREE_OBJECTID, .name_stem = "dreloc" }, | 183 | { .id = BTRFS_DATA_RELOC_TREE_OBJECTID, .name_stem = "dreloc" }, |
| 184 | { .id = BTRFS_UUID_TREE_OBJECTID, .name_stem = "uuid" }, | 184 | { .id = BTRFS_UUID_TREE_OBJECTID, .name_stem = "uuid" }, |
| 185 | { .id = BTRFS_FREE_SPACE_TREE_OBJECTID, .name_stem = "free-space" }, | ||
| 185 | { .id = 0, .name_stem = "tree" }, | 186 | { .id = 0, .name_stem = "tree" }, |
| 186 | }; | 187 | }; |
| 187 | 188 | ||