Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43663557 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Make btrfs_record_snapshot_destroy take btrfs_inode 



Signed-off-by: default avatarNikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 4176bdbf

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -2497,7 +2497,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, 
	trans->block_rsv = &block_rsv;

	trans->bytes_reserved = block_rsv.size;



	btrfs_record_snapshot_destroy(trans, dir);

	btrfs_record_snapshot_destroy(trans, BTRFS_I(dir));



	ret = btrfs_unlink_subvol(trans, root, dir,

				dest->root_key.objectid,

fs/btrfs/tree-log.c

+4 −4
Original line number Diff line number Diff line
@@ -5794,11 +5794,11 @@ void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans, 
 * parent root and tree of tree roots trees, etc) are done.

 */

void btrfs_record_snapshot_destroy(struct btrfs_trans_handle *trans,

				   struct inode *dir)

				   struct btrfs_inode *dir)

{

	mutex_lock(&BTRFS_I(dir)->log_mutex);

	BTRFS_I(dir)->last_unlink_trans = trans->transid;

	mutex_unlock(&BTRFS_I(dir)->log_mutex);

	mutex_lock(&dir->log_mutex);

	dir->last_unlink_trans = trans->transid;

	mutex_unlock(&dir->log_mutex);

}



/*

fs/btrfs/tree-log.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans, 
			     struct btrfs_inode *dir, struct btrfs_inode *inode,

			     int for_rename);

void btrfs_record_snapshot_destroy(struct btrfs_trans_handle *trans,

				   struct inode *dir);

				   struct btrfs_inode *dir);

int btrfs_log_new_name(struct btrfs_trans_handle *trans,

			struct inode *inode, struct inode *old_dir,

			struct dentry *parent);