Commit 91c9f285 authored by David Sterba's avatar David Sterba
Browse files

btrfs: return void from btrfs_add_inode_defrag() 



The potential memory allocation failure is not a fatal error, skipping
autodefrag is fine and the caller inode_should_defrag() does not care
about the errors.  Further writes can attempt to add the inode back to
the defragmentation list again.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 27694091

fs/btrfs/defrag.c

+7 −7
Original line number Diff line number Diff line
@@ -117,9 +117,10 @@ static inline int need_auto_defrag(struct btrfs_fs_info *fs_info) 
}



/*

 * Insert a defrag record for this inode if auto defrag is enabled.

 * Insert a defrag record for this inode if auto defrag is enabled. No errors

 * returned as they're not considered fatal.

 */

int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,

void btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,

			    struct btrfs_inode *inode, u32 extent_thresh)

{

	struct btrfs_root *root = inode->root;
@@ -129,10 +130,10 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, 
	int ret;



	if (!need_auto_defrag(fs_info))

		return 0;

		return;



	if (test_bit(BTRFS_INODE_IN_DEFRAG, &inode->runtime_flags))

		return 0;

		return;



	if (trans)

		transid = trans->transid;
@@ -141,7 +142,7 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, 


	defrag = kmem_cache_zalloc(btrfs_inode_defrag_cachep, GFP_NOFS);

	if (!defrag)

		return -ENOMEM;

		return;



	defrag->ino = btrfs_ino(inode);

	defrag->transid = transid;
@@ -162,7 +163,6 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, 
		kmem_cache_free(btrfs_inode_defrag_cachep, defrag);

	}

	spin_unlock(&fs_info->defrag_inodes_lock);

	return 0;

}



/*

fs/btrfs/defrag.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra, 
		      u64 newer_than, unsigned long max_to_defrag);

int __init btrfs_auto_defrag_init(void);

void __cold btrfs_auto_defrag_exit(void);

int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,

void btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,

			    struct btrfs_inode *inode, u32 extent_thresh);

int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info);

void btrfs_cleanup_defrag_inodes(struct btrfs_fs_info *fs_info);