leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: make btrfs_update_inode_item take btrfs_inode

Browse Source 
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov
2020-11-02 16:48:58 +02:00
committed by David Sterba
parent f3fbcaef59
commit dfeb9e7cc3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/btrfs/inode.c
View File

@@ -3621,7 +3621,8 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,
* copy everything in the in-memory inode into the btree. * copy everything in the in-memory inode into the btree.
*/ */
static noinline int btrfs_update_inode_item(struct btrfs_trans_handle *trans, static noinline int btrfs_update_inode_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct inode *inode) struct btrfs_root *root,
struct btrfs_inode *inode)
{ {
struct btrfs_inode_item *inode_item; struct btrfs_inode_item *inode_item;
struct btrfs_path *path; struct btrfs_path *path;
@@ -3632,8 +3633,7 @@ static noinline int btrfs_update_inode_item(struct btrfs_trans_handle *trans,
if (!path) if (!path)
return -ENOMEM; return -ENOMEM;
ret = btrfs_lookup_inode(trans, root, path, &BTRFS_I(inode)->location, ret = btrfs_lookup_inode(trans, root, path, &inode->location, 1);
1);
if (ret) { if (ret) {
if (ret > 0) if (ret > 0)
ret = -ENOENT; ret = -ENOENT;
@@ -3644,9 +3644,9 @@ static noinline int btrfs_update_inode_item(struct btrfs_trans_handle *trans,
inode_item = btrfs_item_ptr(leaf, path->slots[0], inode_item = btrfs_item_ptr(leaf, path->slots[0],
struct btrfs_inode_item); struct btrfs_inode_item);
fill_inode_item(trans, leaf, inode_item, inode); fill_inode_item(trans, leaf, inode_item, &inode->vfs_inode);
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
btrfs_set_inode_last_trans(trans, BTRFS_I(inode)); btrfs_set_inode_last_trans(trans, inode);
ret = 0; ret = 0;
failed: failed:
btrfs_free_path(path); btrfs_free_path(path);
@@ -3680,7 +3680,7 @@ noinline int btrfs_update_inode(struct btrfs_trans_handle *trans,
return ret; return ret;
} }
return btrfs_update_inode_item(trans, root, inode); return btrfs_update_inode_item(trans, root, BTRFS_I(inode));
} }
noinline int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans, noinline int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,
@@ -3691,7 +3691,7 @@ noinline int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,
ret = btrfs_update_inode(trans, root, inode); ret = btrfs_update_inode(trans, root, inode);
if (ret == -ENOSPC) if (ret == -ENOSPC)
return btrfs_update_inode_item(trans, root, inode); return btrfs_update_inode_item(trans, root, BTRFS_I(inode));
return ret; return ret;
} }