Commit 139e3167 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: reduce arguments to btrfs_del_inode_ref_in_log() 



Instead of passing a root and the objectid of the parent directory, just
pass the directory inode, as like that we can extract both the root and
the objectid, reducing the number of arguments by one. It also makes the
function more consistent with other log tree functions in the sense that
we pass the inode and not only its objectid.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1361f7d8

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -4362,7 +4362,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans, 
	 * operations on the log tree, increasing latency for applications.

	 */

	if (!rename_ctx) {

		btrfs_del_inode_ref_in_log(trans, root, name, inode, dir_ino);

		btrfs_del_inode_ref_in_log(trans, name, inode, dir);

		btrfs_del_dir_entries_in_log(trans, name, dir, index);

	}

fs/btrfs/tree-log.c

+5 −5
Original line number Diff line number Diff line
@@ -3938,11 +3938,11 @@ void btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans, 


/* see comments for btrfs_del_dir_entries_in_log */

void btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,

				struct btrfs_root *root,

				const struct fscrypt_str *name,

				struct btrfs_inode *inode, u64 dirid)

				struct btrfs_inode *inode,

				struct btrfs_inode *dir)

{

	struct btrfs_root *log;

	struct btrfs_root *root = dir->root;

	int ret;



	ret = inode_logged(trans, inode, NULL);
@@ -3957,10 +3957,10 @@ void btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans, 
	ASSERT(ret == 0, "join_running_log_trans() ret=%d", ret);

	if (WARN_ON(ret))

		return;

	log = root->log_root;

	mutex_lock(&inode->log_mutex);



	ret = btrfs_del_inode_ref(trans, log, name, btrfs_ino(inode), dirid, NULL);

	ret = btrfs_del_inode_ref(trans, root->log_root, name, btrfs_ino(inode),

				  btrfs_ino(dir), NULL);

	mutex_unlock(&inode->log_mutex);

	if (ret < 0 && ret != -ENOENT)

		btrfs_set_log_full_commit(trans);

fs/btrfs/tree-log.h

+2 −2
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ void btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans, 
				  const struct fscrypt_str *name,

				  struct btrfs_inode *dir, u64 index);

void btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,

				struct btrfs_root *root,

				const struct fscrypt_str *name,

				struct btrfs_inode *inode, u64 dirid);

				struct btrfs_inode *inode,

				struct btrfs_inode *dir);

void btrfs_end_log_trans(struct btrfs_root *root);

void btrfs_pin_log_trans(struct btrfs_root *root);

void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,