Skip to content

Commit

Permalink
btrfs: use btrfs_ino to access inode number
Browse files Browse the repository at this point in the history
commit 4cb5300 ("Btrfs: add mount -o auto_defrag") accesses inode
number directly while it should use the helper with the new inode
number allocator.

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
David Sterba authored and Chris Mason committed Jun 4, 2011
1 parent d132a53 commit a4689d2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion fs/btrfs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
if (!defrag)
return -ENOMEM;

defrag->ino = inode->i_ino;
defrag->ino = btrfs_ino(inode);
defrag->transid = transid;
defrag->root = root->root_key.objectid;

Expand Down
7 changes: 4 additions & 3 deletions fs/btrfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -706,16 +706,17 @@ static int find_new_extents(struct btrfs_root *root,
struct btrfs_file_extent_item *extent;
int type;
int ret;
u64 ino = btrfs_ino(inode);

path = btrfs_alloc_path();
if (!path)
return -ENOMEM;

min_key.objectid = inode->i_ino;
min_key.objectid = ino;
min_key.type = BTRFS_EXTENT_DATA_KEY;
min_key.offset = *off;

max_key.objectid = inode->i_ino;
max_key.objectid = ino;
max_key.type = (u8)-1;
max_key.offset = (u64)-1;

Expand All @@ -726,7 +727,7 @@ static int find_new_extents(struct btrfs_root *root,
path, 0, newer_than);
if (ret != 0)
goto none;
if (min_key.objectid != inode->i_ino)
if (min_key.objectid != ino)
goto none;
if (min_key.type != BTRFS_EXTENT_DATA_KEY)
goto none;
Expand Down

0 comments on commit a4689d2

Please sign in to comment.