diff options
| author | Chris Mason <clm@fb.com> | 2016-06-08 17:35:11 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-06-08 17:35:11 -0400 |
| commit | 4c52990080e37925039a4d546937e9df2a8da944 (patch) | |
| tree | 15613508128f8b3c3307338ba67748b6431ea36f /fs/btrfs/disk-io.h | |
| parent | 8dff9c85341032767d7b519217a79ea04cd676b0 (diff) | |
| parent | 34b3e6c92af1fa3f7067e4fa05ffa9d8bd41c96c (diff) | |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'fs/btrfs/disk-io.h')
| -rw-r--r-- | fs/btrfs/disk-io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index 8e79d0070bcf..acba821499a9 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h | |||
| @@ -90,7 +90,7 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info, | |||
| 90 | void btrfs_free_fs_root(struct btrfs_root *root); | 90 | void btrfs_free_fs_root(struct btrfs_root *root); |
| 91 | 91 | ||
| 92 | #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS | 92 | #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS |
| 93 | struct btrfs_root *btrfs_alloc_dummy_root(void); | 93 | struct btrfs_root *btrfs_alloc_dummy_root(u32 sectorsize, u32 nodesize); |
| 94 | #endif | 94 | #endif |
| 95 | 95 | ||
| 96 | /* | 96 | /* |