diff options
| author | Chris Mason | 2012-03-29 02:33:40 +0200 |
|---|---|---|
| committer | Chris Mason | 2012-03-29 02:33:40 +0200 |
| commit | 98961a7e431735c791dbaaf0337029e219a5db5a (patch) | |
| tree | e045f062c01075e1f88ab758717cbfd7a7ddd4ca /fs/btrfs/super.c | |
| parent | Merge branch 'for-chris' of git://github.com/idryomov/btrfs-unstable into for... (diff) | |
| parent | Btrfs: fix regression in scrub path resolving (diff) | |
| download | kernel-qcow2-linux-98961a7e431735c791dbaaf0337029e219a5db5a.tar.gz kernel-qcow2-linux-98961a7e431735c791dbaaf0337029e219a5db5a.tar.xz kernel-qcow2-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.c | 2 |
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; |