git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[sfrench/cifs-2.6.git]
/
fs
/
btrfs
/
disk-io.h
diff --git
a/fs/btrfs/disk-io.h
b/fs/btrfs/disk-io.h
index dbf3e1aab69e904a75a6828bbcb6f955166c8b25..b3207a0e09f7966703e1d130e250f05f610b2a3f 100644
(file)
--- a/
fs/btrfs/disk-io.h
+++ b/
fs/btrfs/disk-io.h
@@
-90,7
+90,8
@@
void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info,
void btrfs_free_fs_root(struct btrfs_root *root);
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
void btrfs_free_fs_root(struct btrfs_root *root);
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
-struct btrfs_root *btrfs_alloc_dummy_root(u32 sectorsize, u32 nodesize);
+struct btrfs_root *btrfs_alloc_dummy_root(struct btrfs_fs_info *fs_info,
+ u32 sectorsize, u32 nodesize);
#endif
/*
#endif
/*