summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/super.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2012-03-28 20:33:40 -0400
committerChris Mason <chris.mason@oracle.com>2012-03-28 20:33:40 -0400
commit98961a7e431735c791dbaaf0337029e219a5db5a (patch)
treee045f062c01075e1f88ab758717cbfd7a7ddd4ca /fs/btrfs/super.c
parent1c691b330a19a1344df89bcb0f4cacd99e8b289a (diff)
parent7a3ae2f8c8c8432e65467b7fc84d5deab04061a0 (diff)
downloadblackbird-op-linux-98961a7e431735c791dbaaf0337029e219a5db5a.tar.gz
blackbird-op-linux-98961a7e431735c791dbaaf0337029e219a5db5a.zip
Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus
Conflicts: fs/btrfs/transaction.c Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r--fs/btrfs/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 9db64165123a..84571d7da12e 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1541,6 +1541,8 @@ static int __init init_btrfs_fs(void)
if (err)
goto unregister_ioctl;
+ btrfs_init_lockdep();
+
printk(KERN_INFO "%s loaded\n", BTRFS_BUILD_VERSION);
return 0;
OpenPOWER on IntegriCloud