]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
btrfs: Make log_inode_item take btrfs_inode
authorNikolay Borisov <n.borisov.lkml@gmail.com>
Tue, 17 Jan 2017 22:31:47 +0000 (00:31 +0200)
committerDavid Sterba <dsterba@suse.com>
Tue, 14 Feb 2017 14:50:56 +0000 (15:50 +0100)
Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/tree-log.c

index 5b164ccbb3c09d2f9337a5166ce875b09a5f3eca..92a3963461d8407e558ffc7ade5412acb5d21bb3 100644 (file)
@@ -3596,19 +3596,19 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,
 
 static int log_inode_item(struct btrfs_trans_handle *trans,
                          struct btrfs_root *log, struct btrfs_path *path,
-                         struct inode *inode)
+                         struct btrfs_inode *inode)
 {
        struct btrfs_inode_item *inode_item;
        int ret;
 
        ret = btrfs_insert_empty_item(trans, log, path,
-                                     &BTRFS_I(inode)->location,
-                                     sizeof(*inode_item));
+                                     &inode->location, sizeof(*inode_item));
        if (ret && ret != -EEXIST)
                return ret;
        inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0],
                                    struct btrfs_inode_item);
-       fill_inode_item(trans, path->nodes[0], inode_item, inode, 0, 0);
+       fill_inode_item(trans, path->nodes[0], inode_item, &inode->vfs_inode,
+                       0, 0);
        btrfs_release_path(path);
        return 0;
 }
@@ -4934,7 +4934,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
        btrfs_release_path(path);
        btrfs_release_path(dst_path);
        if (need_log_inode_item) {
-               err = log_inode_item(trans, log, dst_path, inode);
+               err = log_inode_item(trans, log, dst_path, BTRFS_I(inode));
                if (err)
                        goto out_unlock;
        }