diff options
author | David Sterba <dsterba@suse.com> | 2015-11-30 05:02:31 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2016-01-07 08:30:52 -0500 |
commit | 7928d672ffb06085d06fe3c27a93549d37e53ab3 (patch) | |
tree | fa29cf19282288091a65400d0a2ff0f668b9e7b2 | |
parent | 352dd9c8d3b34e406584c95be45cbc4f1ec5a405 (diff) |
btrfs: cleanup, remove stray return statements
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/disk-io.c | 1 | ||||
-rw-r--r-- | fs/btrfs/inode.c | 1 | ||||
-rw-r--r-- | fs/btrfs/locking.c | 2 | ||||
-rw-r--r-- | fs/btrfs/raid56.c | 2 | ||||
-rw-r--r-- | fs/btrfs/scrub.c | 2 | ||||
-rw-r--r-- | fs/btrfs/volumes.c | 1 |
6 files changed, 0 insertions, 9 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 974be09e7556..c76f6ea3edd6 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -3962,7 +3962,6 @@ static void __btrfs_btree_balance_dirty(struct btrfs_root *root, | |||
3962 | balance_dirty_pages_ratelimited( | 3962 | balance_dirty_pages_ratelimited( |
3963 | root->fs_info->btree_inode->i_mapping); | 3963 | root->fs_info->btree_inode->i_mapping); |
3964 | } | 3964 | } |
3965 | return; | ||
3966 | } | 3965 | } |
3967 | 3966 | ||
3968 | void btrfs_btree_balance_dirty(struct btrfs_root *root) | 3967 | void btrfs_btree_balance_dirty(struct btrfs_root *root) |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 1f7229025ec4..3b39cd8cd1be 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -5304,7 +5304,6 @@ void btrfs_evict_inode(struct inode *inode) | |||
5304 | no_delete: | 5304 | no_delete: |
5305 | btrfs_remove_delayed_node(inode); | 5305 | btrfs_remove_delayed_node(inode); |
5306 | clear_inode(inode); | 5306 | clear_inode(inode); |
5307 | return; | ||
5308 | } | 5307 | } |
5309 | 5308 | ||
5310 | /* | 5309 | /* |
diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c index 8077461fc56a..d13128c70ddd 100644 --- a/fs/btrfs/locking.c +++ b/fs/btrfs/locking.c | |||
@@ -56,7 +56,6 @@ void btrfs_set_lock_blocking_rw(struct extent_buffer *eb, int rw) | |||
56 | atomic_dec(&eb->spinning_readers); | 56 | atomic_dec(&eb->spinning_readers); |
57 | read_unlock(&eb->lock); | 57 | read_unlock(&eb->lock); |
58 | } | 58 | } |
59 | return; | ||
60 | } | 59 | } |
61 | 60 | ||
62 | /* | 61 | /* |
@@ -96,7 +95,6 @@ void btrfs_clear_lock_blocking_rw(struct extent_buffer *eb, int rw) | |||
96 | waitqueue_active(&eb->read_lock_wq)) | 95 | waitqueue_active(&eb->read_lock_wq)) |
97 | wake_up(&eb->read_lock_wq); | 96 | wake_up(&eb->read_lock_wq); |
98 | } | 97 | } |
99 | return; | ||
100 | } | 98 | } |
101 | 99 | ||
102 | /* | 100 | /* |
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 1a33d3eb36de..6d707545f775 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c | |||
@@ -503,7 +503,6 @@ static void cache_rbio(struct btrfs_raid_bio *rbio) | |||
503 | } | 503 | } |
504 | 504 | ||
505 | spin_unlock_irqrestore(&table->cache_lock, flags); | 505 | spin_unlock_irqrestore(&table->cache_lock, flags); |
506 | return; | ||
507 | } | 506 | } |
508 | 507 | ||
509 | /* | 508 | /* |
@@ -906,7 +905,6 @@ static void raid_write_end_io(struct bio *bio) | |||
906 | err = -EIO; | 905 | err = -EIO; |
907 | 906 | ||
908 | rbio_orig_end_io(rbio, err); | 907 | rbio_orig_end_io(rbio, err); |
909 | return; | ||
910 | } | 908 | } |
911 | 909 | ||
912 | /* | 910 | /* |
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index b091d94ceef6..b57a15a523a4 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c | |||
@@ -1514,8 +1514,6 @@ static void scrub_recheck_block(struct btrfs_fs_info *fs_info, | |||
1514 | 1514 | ||
1515 | if (sblock->no_io_error_seen) | 1515 | if (sblock->no_io_error_seen) |
1516 | scrub_recheck_block_checksum(sblock); | 1516 | scrub_recheck_block_checksum(sblock); |
1517 | |||
1518 | return; | ||
1519 | } | 1517 | } |
1520 | 1518 | ||
1521 | static inline int scrub_check_fsid(u8 fsid[], | 1519 | static inline int scrub_check_fsid(u8 fsid[], |
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index a23399e8e3ab..8c761aeacccf 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -1642,7 +1642,6 @@ static void update_dev_time(char *path_name) | |||
1642 | return; | 1642 | return; |
1643 | file_update_time(filp); | 1643 | file_update_time(filp); |
1644 | filp_close(filp, NULL); | 1644 | filp_close(filp, NULL); |
1645 | return; | ||
1646 | } | 1645 | } |
1647 | 1646 | ||
1648 | static int btrfs_rm_dev_item(struct btrfs_root *root, | 1647 | static int btrfs_rm_dev_item(struct btrfs_root *root, |