Skip to content

Commit 11e3107

Browse files
committed
btrfs: drop transaction parameter from btrfs_add_inode_defrag()
There's only one caller inode_should_defrag() that passes NULL to btrfs_add_inode_defrag() so we can drop it an simplify the code. Reviewed-by: Qu Wenruo <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 91c9f28 commit 11e3107

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

fs/btrfs/defrag.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,11 @@ static inline int need_auto_defrag(struct btrfs_fs_info *fs_info)
120120
* Insert a defrag record for this inode if auto defrag is enabled. No errors
121121
* returned as they're not considered fatal.
122122
*/
123-
void btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
124-
struct btrfs_inode *inode, u32 extent_thresh)
123+
void btrfs_add_inode_defrag(struct btrfs_inode *inode, u32 extent_thresh)
125124
{
126125
struct btrfs_root *root = inode->root;
127126
struct btrfs_fs_info *fs_info = root->fs_info;
128127
struct inode_defrag *defrag;
129-
u64 transid;
130128
int ret;
131129

132130
if (!need_auto_defrag(fs_info))
@@ -135,17 +133,12 @@ void btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
135133
if (test_bit(BTRFS_INODE_IN_DEFRAG, &inode->runtime_flags))
136134
return;
137135

138-
if (trans)
139-
transid = trans->transid;
140-
else
141-
transid = btrfs_get_root_last_trans(root);
142-
143136
defrag = kmem_cache_zalloc(btrfs_inode_defrag_cachep, GFP_NOFS);
144137
if (!defrag)
145138
return;
146139

147140
defrag->ino = btrfs_ino(inode);
148-
defrag->transid = transid;
141+
defrag->transid = btrfs_get_root_last_trans(root);
149142
defrag->root = btrfs_root_id(root);
150143
defrag->extent_thresh = extent_thresh;
151144

fs/btrfs/defrag.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,
1818
u64 newer_than, unsigned long max_to_defrag);
1919
int __init btrfs_auto_defrag_init(void);
2020
void __cold btrfs_auto_defrag_exit(void);
21-
void btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
22-
struct btrfs_inode *inode, u32 extent_thresh);
21+
void btrfs_add_inode_defrag(struct btrfs_inode *inode, u32 extent_thresh);
2322
int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info);
2423
void btrfs_cleanup_defrag_inodes(struct btrfs_fs_info *fs_info);
2524
int btrfs_defrag_root(struct btrfs_root *root);

fs/btrfs/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ static inline void inode_should_defrag(struct btrfs_inode *inode,
885885
/* If this is a small write inside eof, kick off a defrag */
886886
if (num_bytes < small_write &&
887887
(start > 0 || end + 1 < inode->disk_i_size))
888-
btrfs_add_inode_defrag(NULL, inode, small_write);
888+
btrfs_add_inode_defrag(inode, small_write);
889889
}
890890

891891
static int extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end)

0 commit comments

Comments
 (0)