diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-07-08 17:27:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 17:27:47 +0200 |
| commit | 9e7f7f5425e6d1492109a537ee88c99b29580655 (patch) | |
| tree | 81f9d68abb5b793aadaf80bd6940af04e3c16eb9 /fs/btrfs/tests/btrfs-tests.c | |
| parent | x86/KASLR: Fix boot crash with certain memory configurations (diff) | |
| parent | selftests/x86: Add vDSO mremap() test (diff) | |
| download | linux-dev-9e7f7f5425e6d1492109a537ee88c99b29580655.tar.xz linux-dev-9e7f7f5425e6d1492109a537ee88c99b29580655.zip | |
Merge branch 'x86/mm' into x86/boot, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/tests/btrfs-tests.c')
| -rw-r--r-- | fs/btrfs/tests/btrfs-tests.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c index 10eb249ef891..02223f3f78f4 100644 --- a/fs/btrfs/tests/btrfs-tests.c +++ b/fs/btrfs/tests/btrfs-tests.c @@ -68,7 +68,7 @@ int btrfs_init_test_fs(void) if (IS_ERR(test_mnt)) { printk(KERN_ERR "btrfs: cannot mount test file system\n"); unregister_filesystem(&test_type); - return ret; + return PTR_ERR(test_mnt); } return 0; } |