btrfs: Make btrfs_record_snapshot_destroy take btrfs_inode

Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 03bd53845360b851da9c2fdd022415d59d71ccb2..529cc273e817e6b41d32ce907d06127285513d77 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -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,

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 6f9a3beb7050f566f53dbd64bdbf49be8093ab37..581d31171683c7ad8d5930e5d21955716101e4af 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -5794,11 +5794,11 @@ record:
  * 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);
 }
 
 /*

diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
index 7df0f756f5c887ed850025264bf0dbc4738cbc3e..9b5bf904d5111a3a827c1cc36ae5b879b660b4e9 100644 (file)
--- a/fs/btrfs/tree-log.h
+++ b/fs/btrfs/tree-log.h
@@ -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);