diff options
author | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
commit | 580a7ce8fb5012c0c0afe592bdafd482a3679911 (patch) | |
tree | 3fb6b00359a63d8d2e33005599046c105956d314 /fs/btrfs/disk-io.h | |
parent | a17fb8f520c3c662686aa54a86773f354002c7d3 (diff) | |
parent | e534e871a94ba2e3bfdf0edd3685eb805fc960d8 (diff) |
Merge branch 'fixes-wakeupgen' into fixes
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 95e147eea23..c5b00a735fe 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h @@ -54,7 +54,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans, struct btrfs_root *root, int max_mirrors); struct buffer_head *btrfs_read_dev_super(struct block_device *bdev); int btrfs_commit_super(struct btrfs_root *root); -int btrfs_error_commit_super(struct btrfs_root *root); +void btrfs_error_commit_super(struct btrfs_root *root); struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize); struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root, |