Commit 59fcf388 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: change for_rename argument of btrfs_record_unlink_dir() to bool 



The for_rename argument of btrfs_record_unlink_dir() is defined as an
integer, but the argument is in fact used as a boolean. So change it to
a boolean to make its use more clear.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.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 acfb5a4f

fs/btrfs/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -4425,7 +4425,7 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry) 
	}



	btrfs_record_unlink_dir(trans, BTRFS_I(dir), BTRFS_I(d_inode(dentry)),

			0);

				false);



	ret = btrfs_unlink_inode(trans, BTRFS_I(dir), BTRFS_I(d_inode(dentry)),

				 &fname.disk_name);
@@ -8993,9 +8993,9 @@ static int btrfs_rename_exchange(struct inode *old_dir, 


	if (old_dentry->d_parent != new_dentry->d_parent) {

		btrfs_record_unlink_dir(trans, BTRFS_I(old_dir),

				BTRFS_I(old_inode), 1);

					BTRFS_I(old_inode), true);

		btrfs_record_unlink_dir(trans, BTRFS_I(new_dir),

				BTRFS_I(new_inode), 1);

					BTRFS_I(new_inode), true);

	}



	/* src is a subvolume */
@@ -9261,7 +9261,7 @@ static int btrfs_rename(struct mnt_idmap *idmap, 


	if (old_dentry->d_parent != new_dentry->d_parent)

		btrfs_record_unlink_dir(trans, BTRFS_I(old_dir),

				BTRFS_I(old_inode), 1);

					BTRFS_I(old_inode), true);



	if (unlikely(old_ino == BTRFS_FIRST_FREE_OBJECTID)) {

		ret = btrfs_unlink_subvol(trans, BTRFS_I(old_dir), old_dentry);

fs/btrfs/tree-log.c

+1 −1
Original line number Diff line number Diff line
@@ -7309,7 +7309,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree) 
 */

void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,

			     struct btrfs_inode *dir, struct btrfs_inode *inode,

			     int for_rename)

			     bool for_rename)

{

	/*

	 * when we're logging a file, if it hasn't been renamed

fs/btrfs/tree-log.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 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,

			     struct btrfs_inode *dir, struct btrfs_inode *inode,

			     int for_rename);

			     bool for_rename);

void btrfs_record_snapshot_destroy(struct btrfs_trans_handle *trans,

				   struct btrfs_inode *dir);

void btrfs_log_new_name(struct btrfs_trans_handle *trans,