diff options
| -rw-r--r-- | fs/btrfs/file.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 41ca5fdaee6c..7f134a730efb 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
| @@ -74,7 +74,7 @@ struct inode_defrag { | |||
| 74 | * If an existing record is found the defrag item you | 74 | * If an existing record is found the defrag item you |
| 75 | * pass in is freed | 75 | * pass in is freed |
| 76 | */ | 76 | */ |
| 77 | static int __btrfs_add_inode_defrag(struct inode *inode, | 77 | static void __btrfs_add_inode_defrag(struct inode *inode, |
| 78 | struct inode_defrag *defrag) | 78 | struct inode_defrag *defrag) |
| 79 | { | 79 | { |
| 80 | struct btrfs_root *root = BTRFS_I(inode)->root; | 80 | struct btrfs_root *root = BTRFS_I(inode)->root; |
| @@ -106,11 +106,11 @@ static int __btrfs_add_inode_defrag(struct inode *inode, | |||
| 106 | BTRFS_I(inode)->in_defrag = 1; | 106 | BTRFS_I(inode)->in_defrag = 1; |
| 107 | rb_link_node(&defrag->rb_node, parent, p); | 107 | rb_link_node(&defrag->rb_node, parent, p); |
| 108 | rb_insert_color(&defrag->rb_node, &root->fs_info->defrag_inodes); | 108 | rb_insert_color(&defrag->rb_node, &root->fs_info->defrag_inodes); |
| 109 | return 0; | 109 | return; |
| 110 | 110 | ||
| 111 | exists: | 111 | exists: |
| 112 | kfree(defrag); | 112 | kfree(defrag); |
| 113 | return 0; | 113 | return; |
| 114 | 114 | ||
| 115 | } | 115 | } |
| 116 | 116 | ||
| @@ -123,7 +123,6 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, | |||
| 123 | { | 123 | { |
| 124 | struct btrfs_root *root = BTRFS_I(inode)->root; | 124 | struct btrfs_root *root = BTRFS_I(inode)->root; |
| 125 | struct inode_defrag *defrag; | 125 | struct inode_defrag *defrag; |
| 126 | int ret = 0; | ||
| 127 | u64 transid; | 126 | u64 transid; |
| 128 | 127 | ||
| 129 | if (!btrfs_test_opt(root, AUTO_DEFRAG)) | 128 | if (!btrfs_test_opt(root, AUTO_DEFRAG)) |
| @@ -150,9 +149,9 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, | |||
| 150 | 149 | ||
| 151 | spin_lock(&root->fs_info->defrag_inodes_lock); | 150 | spin_lock(&root->fs_info->defrag_inodes_lock); |
| 152 | if (!BTRFS_I(inode)->in_defrag) | 151 | if (!BTRFS_I(inode)->in_defrag) |
| 153 | ret = __btrfs_add_inode_defrag(inode, defrag); | 152 | __btrfs_add_inode_defrag(inode, defrag); |
| 154 | spin_unlock(&root->fs_info->defrag_inodes_lock); | 153 | spin_unlock(&root->fs_info->defrag_inodes_lock); |
| 155 | return ret; | 154 | return 0; |
| 156 | } | 155 | } |
| 157 | 156 | ||
| 158 | /* | 157 | /* |
