1 files changed, 8 insertions, 10 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 37adad5dabd6..df822908f2be 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -5809,30 +5809,28 @@ void btrfs_record_snapshot_destroy(struct btrfs_trans_handle *trans,
  * full transaction commit is required.
  */
 int btrfs_log_new_name(struct btrfs_trans_handle *trans,
-                        struct inode *inode, struct inode *old_dir,
+                        struct btrfs_inode *inode, struct btrfs_inode *old_dir,
                         struct dentry *parent)
 {
-        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
-        struct btrfs_root * root = BTRFS_I(inode)->root;
+        struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
+        struct btrfs_root * root = inode->root;
 
         /*
          * this will force the logging code to walk the dentry chain
          * up for the file
          */
-        if (S_ISREG(inode->i_mode))
-                BTRFS_I(inode)->last_unlink_trans = trans->transid;
+        if (S_ISREG(inode->vfs_inode.i_mode))
+                inode->last_unlink_trans = trans->transid;
 
         /*
          * if this inode hasn't been logged and directory we're renaming it
          * from hasn't been logged, we don't need to log it
          */
-        if (BTRFS_I(inode)->logged_trans <=
-            fs_info->last_trans_committed &&
-            (!old_dir || BTRFS_I(old_dir)->logged_trans <=
-                    fs_info->last_trans_committed))
+        if (inode->logged_trans <= fs_info->last_trans_committed &&
+            (!old_dir || old_dir->logged_trans <= fs_info->last_trans_committed))
                 return 0;
 
-        return btrfs_log_inode_parent(trans, root, inode, parent, 0,
+        return btrfs_log_inode_parent(trans, root, &inode->vfs_inode, parent, 0,
                                       LLONG_MAX, 1, NULL);
 }