Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

btrfs: make close_ctree return void

There's no user of the return value and we can get rid of the comment in
put_super.

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>

authored by

David Sterba and committed by
Chris Mason
3abdbd78 57cdc8db

+3 -11
+1 -3
fs/btrfs/disk-io.c
··· 3623 3623 return btrfs_commit_transaction(trans, root); 3624 3624 } 3625 3625 3626 - int close_ctree(struct btrfs_root *root) 3626 + void close_ctree(struct btrfs_root *root) 3627 3627 { 3628 3628 struct btrfs_fs_info *fs_info = root->fs_info; 3629 3629 int ret; ··· 3711 3711 3712 3712 btrfs_free_block_rsv(root, root->orphan_block_rsv); 3713 3713 root->orphan_block_rsv = NULL; 3714 - 3715 - return 0; 3716 3714 } 3717 3715 3718 3716 int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,
+1 -1
fs/btrfs/disk-io.h
··· 56 56 int open_ctree(struct super_block *sb, 57 57 struct btrfs_fs_devices *fs_devices, 58 58 char *options); 59 - int close_ctree(struct btrfs_root *root); 59 + void close_ctree(struct btrfs_root *root); 60 60 int write_ctree_super(struct btrfs_trans_handle *trans, 61 61 struct btrfs_root *root, int max_mirrors); 62 62 struct buffer_head *btrfs_read_dev_super(struct block_device *bdev);
+1 -7
fs/btrfs/super.c
··· 307 307 308 308 static void btrfs_put_super(struct super_block *sb) 309 309 { 310 - (void)close_ctree(btrfs_sb(sb)->tree_root); 311 - /* FIXME: need to fix VFS to return error? */ 312 - /* AV: return it _where_? ->put_super() can be triggered by any number 313 - * of async events, up to and including delivery of SIGKILL to the 314 - * last process that kept it busy. Or segfault in the aforementioned 315 - * process... Whom would you report that to? 316 - */ 310 + close_ctree(btrfs_sb(sb)->tree_root); 317 311 } 318 312 319 313 enum {