btrfs: cleanup, remove stray return statements

Signed-off-by: David Sterba <dsterba@suse.com>
(cherry picked from commit 7928d672ffb06085d06fe3c27a93549d37e53ab3)

Conflicts:
	fs/btrfs/raid56.c

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index eb7b9a173980dd4ac30126523eeaff2d82ffeb7e..946539d00bc2b0fe139ba535bee015d5ea346763 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3873,7 +3873,6 @@ static void __btrfs_btree_balance_dirty(struct btrfs_root *root,
                balance_dirty_pages_ratelimited(
                                   root->fs_info->btree_inode->i_mapping);
        }
-       return;
 }
 
 void btrfs_btree_balance_dirty(struct btrfs_root *root)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 92a2b2162d876e5c9fdc21e2d4c66aca4d18984e..195d57fa97fa5c17a73624c4beaa0fae33e62e22 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5233,7 +5233,6 @@ void btrfs_evict_inode(struct inode *inode)
 no_delete:
        btrfs_remove_delayed_node(inode);
        clear_inode(inode);
-       return;
 }
 
 /*

diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c
index f8229ef1b46df098a3b04260c4f943db3e924d49..b437e094c5385af4d2377c4ccd5c0a56fd611513 100644 (file)
--- 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)
                atomic_dec(&eb->spinning_readers);
                read_unlock(&eb->lock);
        }
-       return;
 }
 
 /*
@@ -90,7 +89,6 @@ void btrfs_clear_lock_blocking_rw(struct extent_buffer *eb, int rw)
                    waitqueue_active(&eb->read_lock_wq))
                        wake_up(&eb->read_lock_wq);
        }
-       return;
 }
 
 /*

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index fa72068bd256018e27a13fbc8326b82ce49b207b..1c30c852e99300eea0aa6a9b7ed07c145f597152 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -502,7 +502,6 @@ static void cache_rbio(struct btrfs_raid_bio *rbio)
        }
 
        spin_unlock_irqrestore(&table->cache_lock, flags);
-       return;
 }
 
 /*
@@ -894,7 +893,6 @@ static void raid_write_end_io(struct bio *bio, int err)
                err = -EIO;
 
        rbio_orig_end_io(rbio, err, 0);
-       return;
 }
 
 /*

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 7b747acb483af026ce23faddd3e9e62b07ab7d1c..415150131a85597174e2363b79844db668cacb28 100644 (file)
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -1517,8 +1517,6 @@ static void scrub_recheck_block(struct btrfs_fs_info *fs_info,
 
        if (sblock->no_io_error_seen)
                scrub_recheck_block_checksum(sblock);
-
-       return;
 }
 
 static inline int scrub_check_fsid(u8 fsid[],

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index dfe6df8e5910699e1ae42211680b4c83a43c4c4e..536b2c5813f4541831672af19456ac9190dd1878 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1498,7 +1498,6 @@ static void update_dev_time(char *path_name)
                return;
        file_update_time(filp);
        filp_close(filp, NULL);
-       return;
 }
 
 static int btrfs_rm_dev_item(struct btrfs_root *root,