btrfs: cleanup, remove stray return statements

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 974be09e7556ca3f342cac89357364f4ce3cc016..c76f6ea3edd6284c58ad5ba4bd2b78dd7f428aca 100644 (file)
--- 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,
                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 1f7229025ec4abf6aa3ce8bc8301de9e4f7573d5..3b39cd8cd1be906094e19ceba2a019d446e87f1a 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5304,7 +5304,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 8077461fc56ab256d8d02838ac3c345408edf5a4..d13128c70dddc2b440f29f167efe0862d8792e2e 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;
 }
 
 /*
@@ -96,7 +95,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 1a33d3eb36de184e4cbcf72efb26687857c70051..6d707545f775119e4883378636b5255a9dcc9144 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -503,7 +503,6 @@ static void cache_rbio(struct btrfs_raid_bio *rbio)
        }
 
        spin_unlock_irqrestore(&table->cache_lock, flags);
-       return;
 }
 
 /*
@@ -906,7 +905,6 @@ static void raid_write_end_io(struct bio *bio)
                err = -EIO;
 
        rbio_orig_end_io(rbio, err);
-       return;
 }
 
 /*

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index b091d94ceef68013e992161b0aaf31b47cc645dc..b57a15a523a444064a650f8f71bad2a81c2c91e6 100644 (file)
--- 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,
 
        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 a23399e8e3aba2f63d4c0cee90932d073d3bd113..8c761aeacccf3887426007b00ddb15bd961f2a72 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1642,7 +1642,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,